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 | |
| parent | 6acf54f1cf0a6747bac9fea26f34cfc5a9029523 (diff) | |
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')
| -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 { | |||
| 69 | netdev_features_t set_features; | 69 | netdev_features_t set_features; |
| 70 | enum macvlan_mode mode; | 70 | enum macvlan_mode mode; |
| 71 | u16 flags; | 71 | u16 flags; |
| 72 | int (*receive)(struct sk_buff *skb); | ||
| 73 | int (*forward)(struct net_device *dev, struct sk_buff *skb); | ||
| 74 | /* This array tracks active taps. */ | 72 | /* This array tracks active taps. */ |
| 75 | struct macvtap_queue __rcu *taps[MAX_MACVTAP_QUEUES]; | 73 | struct macvtap_queue __rcu *taps[MAX_MACVTAP_QUEUES]; |
| 76 | /* This list tracks all taps (both enabled and disabled) */ | 74 | /* This list tracks all taps (both enabled and disabled) */ |
| @@ -103,10 +101,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, | |||
| 103 | extern void macvlan_common_setup(struct net_device *dev); | 101 | extern void macvlan_common_setup(struct net_device *dev); |
| 104 | 102 | ||
| 105 | extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev, | 103 | extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev, |
| 106 | struct nlattr *tb[], struct nlattr *data[], | 104 | struct nlattr *tb[], struct nlattr *data[]); |
| 107 | int (*receive)(struct sk_buff *skb), | ||
| 108 | int (*forward)(struct net_device *dev, | ||
| 109 | struct sk_buff *skb)); | ||
| 110 | 105 | ||
| 111 | extern void macvlan_count_rx(const struct macvlan_dev *vlan, | 106 | extern void macvlan_count_rx(const struct macvlan_dev *vlan, |
| 112 | unsigned int len, bool success, | 107 | unsigned int len, bool success, |
