[MAC80211]: remove TKIP mixing for hw accel again

[linux-2.6] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 39b87dad35b7daed54d45b059896cff80cbb19f0..99292e8e1d0f05f2f813d85b08c8497e31c1d98d 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -41,11 +41,11 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
        skb_pull(skb, ETH_HLEN);
 
        if (dest[0] & 1)
-               br_flood_deliver(br, skb, 0);
+               br_flood_deliver(br, skb);
        else if ((dst = __br_fdb_get(br, dest)) != NULL)
                br_deliver(dst->dst, skb);
        else
-               br_flood_deliver(br, skb, 0);
+               br_flood_deliver(br, skb);
 
        return 0;
 }
@@ -88,7 +88,6 @@ static int br_set_mac_address(struct net_device *dev, void *p)
 {
        struct net_bridge *br = netdev_priv(dev);
        struct sockaddr *addr = p;
-       struct net_bridge_port *port;
 
        if (!is_valid_ether_addr(addr->sa_data))
                return -EINVAL;
@@ -180,5 +179,5 @@ void br_dev_setup(struct net_device *dev)
        dev->priv_flags = IFF_EBRIDGE;
 
        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
-                       NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST;
+                       NETIF_F_GSO_MASK | NETIF_F_NO_CSUM | NETIF_F_LLTX;
 }