drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata

[net-next-2.6.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index c70ad515383add23bbac3a489d197b5245d4e091..0f4219cb0be2e5ab88fba5c82ba7ebd822af781f 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4101,7 +4101,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        queue = 0;
-       if (sp->vlgrp && vlan_tx_tag_present(skb))
+       if (vlan_tx_tag_present(skb))
                vlan_tag = vlan_tx_tag_get(skb);
        if (sp->config.tx_steering_type == TX_DEFAULT_STEERING) {
                if (skb->protocol == htons(ETH_P_IP)) {
@@ -8321,8 +8321,7 @@ mem_alloc_failed:
 
 static void __devexit s2io_rem_nic(struct pci_dev *pdev)
 {
-       struct net_device *dev =
-               (struct net_device *)pci_get_drvdata(pdev);
+       struct net_device *dev = pci_get_drvdata(pdev);
        struct s2io_nic *sp;
 
        if (dev == NULL) {