[PATCH] r8168: r8168 fixes

[Nishit Shah <nsshah.82@gmail.com>]

Hi,

The following patch fixes three r8168 bugs:

1) vlan tag missing in transmit path. Due to incorrect assignment of
transmit vlan tag option, driver is not able to transmit data on vlan
interface.

2) compilation warning with rtl8168_powerup_pll if CONFIG_PM isn’t defined.

3) compilation warning with unused variable dev in rtl8168_tx_clear.

Signed-off-by: Rajesh Modhwadiya <rajesh.modhwadiya@elitecore.com>
Signed-off-by: Nishit Shah <nishit.shah@elitecore.com>

---
r8168_n.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- r8168-8.011.00/src/r8168_n.c        2009-02-18 09:23:21.000000000 +0530
+++ r8168-8.011.00-tmp/src/r8168_n.c    2009-05-15 01:40:57.000000000 +0530
@@ -808,6 +808,8 @@
        }
 }

+#ifdef CONFIG_PM
+
 static void
 rtl8168_powerup_pll(struct net_device *dev)  { @@ -825,6 +827,8 @@
        rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex);  }

+#endif /* CONFIG_PM */
+
 static void
 rtl8168_get_wol(struct net_device *dev,
                struct ethtool_wolinfo *wol) @@ -4151,7 +4155,6 @@
rtl8168_tx_clear(struct rtl8168_private *tp)  {
        unsigned int i;
-       struct net_device *dev = tp->dev;

        for (i = tp->dirty_tx; i < tp->dirty_tx + NUM_TX_DESC; i++) {
                unsigned int entry = i % NUM_TX_DESC; @@ -4436,7 +4439,7 @@

        tp->tx_skb[entry].len = len;
        txd->addr = cpu_to_le64(mapping);
-       txd->opts2 = cpu_to_le32(rtl8168_tx_vlan_tag(tp, skb));
+       opts2 |= cpu_to_le32(rtl8168_tx_vlan_tag(tp, skb));

        wmb();


Rgds,
Nishit Shah.