Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index cabde9ab0e4a8871b6f341d3a92fdaaccb8a74bb..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;
@@ -361,18 +364,23 @@ static const struct ethtool_ops macvlan_ethtool_ops = {
        .get_flags              = macvlan_ethtool_get_flags,
 };
 
+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,
+       .ndo_set_multicast_list = macvlan_set_multicast_list,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+
 static void macvlan_setup(struct net_device *dev)
 {
        ether_setup(dev);
 
-       dev->init               = macvlan_init;
-       dev->open               = macvlan_open;
-       dev->stop               = macvlan_stop;
-       dev->change_mtu         = macvlan_change_mtu;
-       dev->change_rx_flags    = macvlan_change_rx_flags;
-       dev->set_mac_address    = macvlan_set_mac_address;
-       dev->set_multicast_list = macvlan_set_multicast_list;
-       dev->hard_start_xmit    = macvlan_hard_start_xmit;
+       dev->netdev_ops         = &macvlan_netdev_ops;
        dev->destructor         = free_netdev;
        dev->header_ops         = &macvlan_hard_header_ops,
        dev->ethtool_ops        = &macvlan_ethtool_ops;