drivers/net/wireless/b43: fix sparse warnings: make symbols static

[karo-tx-linux.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d00ea444e0a310086df39bd8c8d6846285272557..7e24b50486869c8295e19d8b7339b7d56d6ef909 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -70,6 +70,9 @@ static void macvlan_broadcast(struct sk_buff *skb,
        struct sk_buff *nskb;
        unsigned int i;
 
+       if (skb->protocol == htons(ETH_P_PAUSE))
+               return;
+
        for (i = 0; i < MACVLAN_HASH_SIZE; i++) {
                hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) {
                        dev = vlan->dev;
@@ -140,7 +143,7 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
        return NULL;
 }
 
-static int macvlan_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static int macvlan_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        const struct macvlan_dev *vlan = netdev_priv(dev);
        unsigned int len = skb->len;
@@ -365,6 +368,7 @@ static const struct net_device_ops macvlan_netdev_ops = {
        .ndo_init               = macvlan_init,
        .ndo_open               = macvlan_open,
        .ndo_stop               = macvlan_stop,
+       .ndo_start_xmit         = macvlan_start_xmit,
        .ndo_change_mtu         = macvlan_change_mtu,
        .ndo_change_rx_flags    = macvlan_change_rx_flags,
        .ndo_set_mac_address    = macvlan_set_mac_address,
@@ -377,7 +381,6 @@ static void macvlan_setup(struct net_device *dev)
        ether_setup(dev);
 
        dev->netdev_ops         = &macvlan_netdev_ops;
-       dev->hard_start_xmit    = macvlan_hard_start_xmit;
        dev->destructor         = free_netdev;
        dev->header_ops         = &macvlan_hard_header_ops,
        dev->ethtool_ops        = &macvlan_ethtool_ops;