提交 67981583 编写于 作者: Y Ying Xue 提交者: David S. Miller

tipc: correct return value of recv_msg routine

Currently, rcv_msg() always returns zero on a packet delivery upcall
from net_device.

To make its behavior more compliant with the way this API should be
used, we change this to let it return NET_RX_SUCCESS (which is zero
anyway) when it is able to handle the packet, and NET_RX_DROP otherwise.
The latter does not imply any functional change, it only enables the
driver to keep more accurate statistics about the fate of delivered
packets.
Signed-off-by: NYing Xue <ying.xue@windriver.com>
Reviewed-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f2875c3c
...@@ -132,18 +132,18 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, ...@@ -132,18 +132,18 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
if (!net_eq(dev_net(dev), &init_net)) { if (!net_eq(dev_net(dev), &init_net)) {
kfree_skb(buf); kfree_skb(buf);
return 0; return NET_RX_DROP;
} }
if (likely(eb_ptr->bearer)) { if (likely(eb_ptr->bearer)) {
if (likely(buf->pkt_type <= PACKET_BROADCAST)) { if (likely(buf->pkt_type <= PACKET_BROADCAST)) {
buf->next = NULL; buf->next = NULL;
tipc_recv_msg(buf, eb_ptr->bearer); tipc_recv_msg(buf, eb_ptr->bearer);
return 0; return NET_RX_SUCCESS;
} }
} }
kfree_skb(buf); kfree_skb(buf);
return 0; return NET_RX_DROP;
} }
/** /**
......
...@@ -125,18 +125,18 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, ...@@ -125,18 +125,18 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
if (!net_eq(dev_net(dev), &init_net)) { if (!net_eq(dev_net(dev), &init_net)) {
kfree_skb(buf); kfree_skb(buf);
return 0; return NET_RX_DROP;
} }
if (likely(ib_ptr->bearer)) { if (likely(ib_ptr->bearer)) {
if (likely(buf->pkt_type <= PACKET_BROADCAST)) { if (likely(buf->pkt_type <= PACKET_BROADCAST)) {
buf->next = NULL; buf->next = NULL;
tipc_recv_msg(buf, ib_ptr->bearer); tipc_recv_msg(buf, ib_ptr->bearer);
return 0; return NET_RX_SUCCESS;
} }
} }
kfree_skb(buf); kfree_skb(buf);
return 0; return NET_RX_DROP;
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册