diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2013-12-11 13:27:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-12 13:38:39 -0500 |
| commit | 2f6a1b6607fd6b0eb9501843a40e0c7555f37b4a (patch) | |
| tree | 80d2a3c5c9396bdd07c751eaa2ccfd42cd9c87c2 /include/linux/if_macvlan.h | |
| parent | 6acf54f1cf0a6747bac9fea26f34cfc5a9029523 (diff) | |
| download | linux-stable-2f6a1b6607fd6b0eb9501843a40e0c7555f37b4a.tar.gz linux-stable-2f6a1b6607fd6b0eb9501843a40e0c7555f37b4a.tar.bz2 linux-stable-2f6a1b6607fd6b0eb9501843a40e0c7555f37b4a.zip | |
macvlan: Remove custom recieve and forward handlers
Since now macvlan and macvtap use the same receive and
forward handlers, we can remove them completely and use
netif_rx and dev_forward_skb() directly.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_macvlan.h')
| -rw-r--r-- | include/linux/if_macvlan.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 84ba5ac39e03..ea22721ba269 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -69,8 +69,6 @@ struct macvlan_dev { netdev_features_t set_features; enum macvlan_mode mode; u16 flags; - int (*receive)(struct sk_buff *skb); - int (*forward)(struct net_device *dev, struct sk_buff *skb); /* This array tracks active taps. */ struct macvtap_queue __rcu *taps[MAX_MACVTAP_QUEUES]; /* This list tracks all taps (both enabled and disabled) */ @@ -103,10 +101,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, extern void macvlan_common_setup(struct net_device *dev); extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], - int (*receive)(struct sk_buff *skb), - int (*forward)(struct net_device *dev, - struct sk_buff *skb)); + struct nlattr *tb[], struct nlattr *data[]); extern void macvlan_count_rx(const struct macvlan_dev *vlan, unsigned int len, bool success, |