Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.fixes / dcb-setting-pg-will-cause-tx-hang

diff --git a/src/patches/suse-2.6.27.31/patches.fixes/dcb-setting-pg-will-cause-tx-hang b/src/patches/suse-2.6.27.31/patches.fixes/dcb-setting-pg-will-cause-tx-hang
deleted file mode 100644 (file)
index abece8f..0000000
--- a/src/patches/suse-2.6.27.31/patches.fixes/dcb-setting-pg-will-cause-tx-hang
+++ /dev/null
@@ -1,74 +0,0 @@
-Subject: DCB: setting pg will cause tx unit hangs
-From: Alexander Duyck <alexander.h.duyck@intel.com>
-References: bnc#438954
-
-It seems like the configuration may be doing things while the adapter is
-still up that it shouldn't. 
-
-Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
-Acked-by: Hannes Reinecke <hare@suse.de>
----
-
- drivers/net/ixgbe/ixgbe_dcb_nl.c |   16 ++++++++++------
- 1 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
-index 32d11e5..ca2537e 100644
---- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
-+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
-@@ -135,7 +135,7 @@ static void ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                       return;
-               } else {
--                      if (netdev->flags & IFF_UP)
-+                      if (netif_running(netdev))
-                               netdev->stop(netdev);
-                       ixgbe_reset_interrupt_capability(adapter);
-                       ixgbe_napi_del_all(adapter);
-@@ -149,13 +149,13 @@ static void ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
-                       adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
-                       ixgbe_init_interrupt_scheme(adapter);
-                       ixgbe_napi_add_all(adapter);
--                      if (netdev->flags & IFF_UP)
-+                      if (netif_running(netdev))
-                               netdev->open(netdev);
-               }
-       } else {
-               /* Turn off DCB */
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
--                      if (netdev->flags & IFF_UP)
-+                      if (netif_running(netdev))
-                               netdev->stop(netdev);
-                       ixgbe_reset_interrupt_capability(adapter);
-                       ixgbe_napi_del_all(adapter);
-@@ -169,7 +169,7 @@ static void ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
-                       adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
-                       ixgbe_init_interrupt_scheme(adapter);
-                       ixgbe_napi_add_all(adapter);
--                      if (netdev->flags & IFF_UP)
-+                      if (netif_running(netdev))
-                               netdev->open(netdev);
-               } else {
-                       return;
-@@ -338,6 +338,9 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
-       while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
-               msleep(1);
- 
-+      if (netif_running(netdev))
-+              ixgbe_down(adapter);
-+
-       ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
-                                adapter->ring_feature[RING_F_DCB].indices);
-       if (ret) {
-@@ -345,8 +348,9 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
-               return ret;
-       }
- 
--      ixgbe_down(adapter);
--      ixgbe_up(adapter);
-+      if (netif_running(netdev))
-+              ixgbe_up(adapter);
-+
-       adapter->dcb_set_bitmap = 0x00;
-       clear_bit(__IXGBE_RESETTING, &adapter->state);
-       return ret;