Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05532121 authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

net: 802.1q: make vlan_hwaccel_do_receive() return void 



vlan_hwaccel_do_receive() always returns 0, so make it return void.

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2436243a

include/linux/if_vlan.h

+2 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev); 


extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,

			     u16 vlan_tci, int polling);

extern int vlan_hwaccel_do_receive(struct sk_buff *skb);

extern void vlan_hwaccel_do_receive(struct sk_buff *skb);

extern gro_result_t

vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,

		 unsigned int vlan_tci, struct sk_buff *skb);
@@ -147,9 +147,8 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, 
	return NET_XMIT_SUCCESS;

}



static inline int vlan_hwaccel_do_receive(struct sk_buff *skb)

static inline void vlan_hwaccel_do_receive(struct sk_buff *skb)

{

	return 0;

}



static inline gro_result_t

net/8021q/vlan_core.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, 
}

EXPORT_SYMBOL(__vlan_hwaccel_rx);



int vlan_hwaccel_do_receive(struct sk_buff *skb)

void vlan_hwaccel_do_receive(struct sk_buff *skb)

{

	struct net_device *dev = skb->dev;

	struct vlan_rx_stats     *rx_stats;
@@ -69,7 +69,6 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb) 
		break;

	}

	u64_stats_update_end(&rx_stats->syncp);

	return 0;

}



struct net_device *vlan_dev_real_dev(const struct net_device *dev)

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -2841,8 +2841,8 @@ static int __netif_receive_skb(struct sk_buff *skb) 
	if (!netdev_tstamp_prequeue)

		net_timestamp_check(skb);



	if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))

		return NET_RX_SUCCESS;

	if (vlan_tx_tag_present(skb))

		vlan_hwaccel_do_receive(skb);



	/* if we've gotten here through NAPI, check netpoll */

	if (netpoll_receive_skb(skb))