Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / netxen / netxen_nic_hw.c

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 37d3ebd65be898b50b3f9e5fd0ab9e1c2c2cfbc9..5cef718fe35f2425bc7afcfc859b9e0008fadac2 100644 (file)
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -655,7 +655,7 @@ nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op)
 }
 
 static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
-               u8 *addr, struct list_head *del_list)
+               const u8 *addr, struct list_head *del_list)
 {
        struct list_head *head;
        nx_mac_list_t *cur;
@@ -686,7 +686,9 @@ static void netxen_p3_nic_set_multi(struct net_device *netdev)
 {
        struct netxen_adapter *adapter = netdev_priv(netdev);
        struct netdev_hw_addr *ha;
-       u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+       static const u8 bcast_addr[ETH_ALEN] = {
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+       };
        u32 mode = VPORT_MISS_MODE_DROP;
        LIST_HEAD(del_list);
        struct list_head *head;
@@ -807,9 +809,6 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
        u64 word;
        int rv = 0;
 
-       if ((adapter->flags & NETXEN_NIC_LRO_ENABLED) == enable)
-               return 0;
-
        memset(&req, 0, sizeof(nx_nic_req_t));
 
        req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
@@ -825,8 +824,6 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
                        "configure hw lro request\n");
        }
 
-       adapter->flags ^= NETXEN_NIC_LRO_ENABLED;
-
        return rv;
 }
 
@@ -869,9 +866,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
        u64 word;
        int i, rv;
 
-       u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
-                       0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
-                       0x255b0ec26d5a56daULL };
+       static const u64 key[] = {
+               0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
+               0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
+               0x255b0ec26d5a56daULL
+       };
 
 
        memset(&req, 0, sizeof(nx_nic_req_t));
@@ -895,7 +894,7 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
                ((u64)(enable & 0x1) << 8) |
                ((0x7ULL) << 48);
        req.words[0] = cpu_to_le64(word);
-       for (i = 0; i < 5; i++)
+       for (i = 0; i < ARRAY_SIZE(key); i++)
                req.words[i+1] = cpu_to_le64(key[i]);