aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-12-27 15:06:46 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-28 01:20:46 -0500
commit0db901bd33f09b0dbf39d12261f689812e343c26 (patch)
treec2c7cb907f1b1ea7c782fc2089b5e5a690ab2648
parent69c588529d71b0cae55e5e314b27b1d0300d2e02 (diff)
macvlan: make start_xmit local
Only used in one file, no need to expose Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/macvlan.c5
-rw-r--r--include/linux/if_macvlan.h3
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 24ea994b6274..10406dbc35b3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -290,8 +290,8 @@ xmit_world:
290 return dev_queue_xmit(skb); 290 return dev_queue_xmit(skb);
291} 291}
292 292
293netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, 293static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
294 struct net_device *dev) 294 struct net_device *dev)
295{ 295{
296 unsigned int len = skb->len; 296 unsigned int len = skb->len;
297 int ret; 297 int ret;
@@ -317,7 +317,6 @@ netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
317 } 317 }
318 return ret; 318 return ret;
319} 319}
320EXPORT_SYMBOL_GPL(macvlan_start_xmit);
321 320
322static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev, 321static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
323 unsigned short type, const void *daddr, 322 unsigned short type, const void *daddr,
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index ea22721ba269..551bdd3722a2 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -111,9 +111,6 @@ extern void macvlan_dellink(struct net_device *dev, struct list_head *head);
111 111
112extern int macvlan_link_register(struct rtnl_link_ops *ops); 112extern int macvlan_link_register(struct rtnl_link_ops *ops);
113 113
114extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
115 struct net_device *dev);
116
117#if IS_ENABLED(CONFIG_MACVLAN) 114#if IS_ENABLED(CONFIG_MACVLAN)
118static inline struct net_device * 115static inline struct net_device *
119macvlan_dev_real_dev(const struct net_device *dev) 116macvlan_dev_real_dev(const struct net_device *dev)