diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-14 18:15:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-14 18:15:33 -0400 |
| commit | 748336087374ca7e5369f310745fa1d3b4a8cbf7 (patch) | |
| tree | a13671709fa2cf67d7802526f2ebd4e282aa6010 /net/batman-adv/hard-interface.c | |
| parent | c597f6653d5734c11b1e3217c7619a37e96e5a1f (diff) | |
| parent | 521251f2f5fa16747cc21e71580e404af855d140 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
* an improvement to avoid to linearise the whole received packet when not needed
* an improvement for client traffic rerouting after roaming
* a fix for the local translation table state-machine
* minor cleanups and fixes
Diffstat (limited to 'net/batman-adv/hard-interface.c')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 0b84bb1b62c..dc334fa8984 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -173,9 +173,9 @@ static void check_known_mac_addr(const struct net_device *net_dev) net_dev->dev_addr)) continue; - pr_warning("The newly added mac address (%pM) already exists on: %s\n", - net_dev->dev_addr, hard_iface->net_dev->name); - pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); + pr_warn("The newly added mac address (%pM) already exists on: %s\n", + net_dev->dev_addr, hard_iface->net_dev->name); + pr_warn("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); } |