diff options
Diffstat (limited to 'net/tipc/eth_media.c')
-rw-r--r-- | net/tipc/eth_media.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 9cd35eec3e7f..fe43ef7dd7e3 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -82,7 +82,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr, | |||
82 | dev->dev_addr, clone->len); | 82 | dev->dev_addr, clone->len); |
83 | dev_queue_xmit(clone); | 83 | dev_queue_xmit(clone); |
84 | } | 84 | } |
85 | return TIPC_OK; | 85 | return 0; |
86 | } | 86 | } |
87 | 87 | ||
88 | /** | 88 | /** |
@@ -101,7 +101,7 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, | |||
101 | struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv; | 101 | struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv; |
102 | u32 size; | 102 | u32 size; |
103 | 103 | ||
104 | if (dev_net(dev) != &init_net) { | 104 | if (!net_eq(dev_net(dev), &init_net)) { |
105 | kfree_skb(buf); | 105 | kfree_skb(buf); |
106 | return 0; | 106 | return 0; |
107 | } | 107 | } |
@@ -113,12 +113,12 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, | |||
113 | if (likely(buf->len == size)) { | 113 | if (likely(buf->len == size)) { |
114 | buf->next = NULL; | 114 | buf->next = NULL; |
115 | tipc_recv_msg(buf, eb_ptr->bearer); | 115 | tipc_recv_msg(buf, eb_ptr->bearer); |
116 | return TIPC_OK; | 116 | return 0; |
117 | } | 117 | } |
118 | } | 118 | } |
119 | } | 119 | } |
120 | kfree_skb(buf); | 120 | kfree_skb(buf); |
121 | return TIPC_OK; | 121 | return 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | /** | 124 | /** |
@@ -198,7 +198,7 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt, | |||
198 | struct eth_bearer *eb_ptr = ð_bearers[0]; | 198 | struct eth_bearer *eb_ptr = ð_bearers[0]; |
199 | struct eth_bearer *stop = ð_bearers[MAX_ETH_BEARERS]; | 199 | struct eth_bearer *stop = ð_bearers[MAX_ETH_BEARERS]; |
200 | 200 | ||
201 | if (dev_net(dev) != &init_net) | 201 | if (!net_eq(dev_net(dev), &init_net)) |
202 | return NOTIFY_DONE; | 202 | return NOTIFY_DONE; |
203 | 203 | ||
204 | while ((eb_ptr->dev != dev)) { | 204 | while ((eb_ptr->dev != dev)) { |