diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-11-18 15:40:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-19 10:37:03 -0500 |
| commit | 5a2138812604c32b7617b3b2e53e336617121d3b (patch) | |
| tree | be6e71e9341b9f969e45539071b631238b14fd7f /net/packet | |
| parent | db60eb5f6506cbfb437cf51be050368e6577a848 (diff) | |
| download | linux-stable-5a2138812604c32b7617b3b2e53e336617121d3b.tar.gz linux-stable-5a2138812604c32b7617b3b2e53e336617121d3b.tar.bz2 linux-stable-5a2138812604c32b7617b3b2e53e336617121d3b.zip | |
af_packet: Use virtio_net_hdr_from_skb() directly.
Remove static function __packet_rcv_vnet(), which only called
virtio_net_hdr_from_skb() and BUG()ged out if an error code was
returned. Instead, call virtio_net_hdr_from_skb() from the former
call sites of __packet_rcv_vnet() and actually use the error handling
code that is already there.
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 1816b77e55b5..fab9bbfdead5 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1967,15 +1967,6 @@ static unsigned int run_filter(struct sk_buff *skb, return res; } -static int __packet_rcv_vnet(const struct sk_buff *skb, - struct virtio_net_hdr *vnet_hdr) -{ - if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le())) - BUG(); - - return 0; -} - static int packet_rcv_vnet(struct msghdr *msg, const struct sk_buff *skb, size_t *len) { @@ -1985,7 +1976,7 @@ static int packet_rcv_vnet(struct msghdr *msg, const struct sk_buff *skb, return -EINVAL; *len -= sizeof(vnet_hdr); - if (__packet_rcv_vnet(skb, &vnet_hdr)) + if (virtio_net_hdr_from_skb(skb, &vnet_hdr, vio_le())) return -EINVAL; return memcpy_to_msg(msg, (void *)&vnet_hdr, sizeof(vnet_hdr)); @@ -2244,8 +2235,9 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, spin_unlock(&sk->sk_receive_queue.lock); if (po->has_vnet_hdr) { - if (__packet_rcv_vnet(skb, h.raw + macoff - - sizeof(struct virtio_net_hdr))) { + if (virtio_net_hdr_from_skb(skb, h.raw + macoff - + sizeof(struct virtio_net_hdr), + vio_le())) { spin_lock(&sk->sk_receive_queue.lock); goto drop_n_account; } |