diff options
Diffstat (limited to 'drivers/net/bonding/bond_ipv6.c')
-rw-r--r-- | drivers/net/bonding/bond_ipv6.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c index b72e1dc8cf8f..6dd64cf3cb76 100644 --- a/drivers/net/bonding/bond_ipv6.c +++ b/drivers/net/bonding/bond_ipv6.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
23 | #include <linux/types.h> | 25 | #include <linux/types.h> |
24 | #include <linux/if_vlan.h> | 26 | #include <linux/if_vlan.h> |
25 | #include <net/ipv6.h> | 27 | #include <net/ipv6.h> |
@@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev, | |||
74 | addrconf_addr_solict_mult(daddr, &mcaddr); | 76 | addrconf_addr_solict_mult(daddr, &mcaddr); |
75 | 77 | ||
76 | pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n", | 78 | pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n", |
77 | slave_dev->name, &mcaddr, daddr); | 79 | slave_dev->name, &mcaddr, daddr); |
78 | 80 | ||
79 | skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr, | 81 | skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr, |
80 | ND_OPT_TARGET_LL_ADDR); | 82 | ND_OPT_TARGET_LL_ADDR); |
81 | 83 | ||
82 | if (!skb) { | 84 | if (!skb) { |
83 | pr_err(DRV_NAME ": NA packet allocation failed\n"); | 85 | pr_err("NA packet allocation failed\n"); |
84 | return; | 86 | return; |
85 | } | 87 | } |
86 | 88 | ||
87 | if (vlan_id) { | 89 | if (vlan_id) { |
88 | skb = vlan_put_tag(skb, vlan_id); | 90 | skb = vlan_put_tag(skb, vlan_id); |
89 | if (!skb) { | 91 | if (!skb) { |
90 | pr_err(DRV_NAME ": failed to insert VLAN tag\n"); | 92 | pr_err("failed to insert VLAN tag\n"); |
91 | return; | 93 | return; |
92 | } | 94 | } |
93 | } | 95 | } |
@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond) | |||
109 | struct inet6_dev *idev; | 111 | struct inet6_dev *idev; |
110 | int is_router; | 112 | int is_router; |
111 | 113 | ||
112 | pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name, | 114 | pr_debug("%s: bond %s slave %s\n", bond->dev->name, |
113 | slave ? slave->dev->name : "NULL"); | 115 | __func__, slave ? slave->dev->name : "NULL"); |
114 | 116 | ||
115 | if (!slave || !bond->send_unsol_na || | 117 | if (!slave || !bond->send_unsol_na || |
116 | test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state)) | 118 | test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state)) |