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

[mv-sheeva.git] / drivers / net / qlge / qlge_main.c

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 2555b1d34f346d691f904bb3f8593a3933f2b6fc..49bfa5813068d788af16c67f9a1f79c36426ad79 100644 (file)
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3548,12 +3548,13 @@ err_irq:
 
 static int ql_start_rss(struct ql_adapter *qdev)
 {
-       u8 init_hash_seed[] = {0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
-                               0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f,
-                               0xb0, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b,
-                               0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80,
-                               0x30, 0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b,
-                               0xbe, 0xac, 0x01, 0xfa};
+       static const u8 init_hash_seed[] = {
+               0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
+               0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
+               0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
+               0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
+               0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
+       };
        struct ricb *ricb = &qdev->ricb;
        int status = 0;
        int i;
@@ -3844,7 +3845,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
 
 static void ql_display_dev_info(struct net_device *ndev)
 {
-       struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+       struct ql_adapter *qdev = netdev_priv(ndev);
 
        netif_info(qdev, probe, qdev->ndev,
                   "Function #%d, Port %d, NIC Roll %d, NIC Rev = %d, "
@@ -4264,7 +4265,7 @@ static struct net_device_stats *qlge_get_stats(struct net_device
 
 static void qlge_set_multicast_list(struct net_device *ndev)
 {
-       struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+       struct ql_adapter *qdev = netdev_priv(ndev);
        struct netdev_hw_addr *ha;
        int i, status;
 
@@ -4354,7 +4355,7 @@ exit:
 
 static int qlge_set_mac_address(struct net_device *ndev, void *p)
 {
-       struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+       struct ql_adapter *qdev = netdev_priv(ndev);
        struct sockaddr *addr = p;
        int status;
 
@@ -4377,7 +4378,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)
 
 static void qlge_tx_timeout(struct net_device *ndev)
 {
-       struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
+       struct ql_adapter *qdev = netdev_priv(ndev);
        ql_queue_asic_error(qdev);
 }