Re: [PATCH 11/14] vlan: clean up vlan_dev_hard_start_xmit()
flat view
From: Patrick McHardy <hidden>
Date: 2012-08-10 07:14:38
On Fri, 10 Aug 2012, Cong Wang wrote:
quoted hunk ↗ jump to hunk
Clean up vlan_dev_hard_start_xmit() function. Cc: Benjamin LaHaise <bcrl@kvack.org> Cc: Patrick McHardy <redacted> Cc: David Miller <davem@davemloft.net> Signed-off-by: Cong Wang <redacted> --- net/8021q/vlan_dev.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-)diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b65623f..dedc56c 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c@@ -137,9 +137,21 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,return rc; } +static inline netdev_tx_t vlan_netpoll_send_skb(struct vlan_dev_priv *info, struct sk_buff *skb) +{ +#ifdef CONFIG_NET_POLL_CONTROLLER + if (info->netpoll) + netpoll_send_skb(info->netpoll, skb); +#else + BUG(); +#endif + return NETDEV_TX_OK; +} + static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { + struct vlan_dev_priv *info = vlan_dev_priv(dev);
We're consistently using "vlan" for the private data throughout the code. Please keep it that way.