From 2b67b99983a2710ffe23a1073db727a9720b40c9 Mon Sep 17 00:00:00 2001 From: Vasu Dev Date: Fri, 14 Aug 2009 12:41:28 +0000 Subject: [PATCH] --- yaml --- r: 159677 b: refs/heads/master c: 36a82236314b5ebd6e3e1eb8bb7b850c83e53c3a h: refs/heads/master i: 159675: 82a6ea4eb0d197275dbf20e5eae79527a0cf697f v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_dcb_nl.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 78e5a00bd7d6..6ae725418caa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b85daa5324a3c9e560a4351c17d18f49c647eb5c +refs/heads/master: 36a82236314b5ebd6e3e1eb8bb7b850c83e53c3a diff --git a/trunk/drivers/net/ixgbe/ixgbe_dcb_nl.c b/trunk/drivers/net/ixgbe/ixgbe_dcb_nl.c index 1c7265732900..116f12cc2c70 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_dcb_nl.c +++ b/trunk/drivers/net/ixgbe/ixgbe_dcb_nl.c @@ -148,7 +148,10 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) IXGBE_FCRETA_SIZE; netdev->features |= NETIF_F_FCOE_CRC; netdev->features |= NETIF_F_FSO; + netdev->vlan_features |= NETIF_F_FCOE_CRC; + netdev->vlan_features |= NETIF_F_FSO; netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1; + netdev_features_change(netdev); } #endif /* IXGBE_FCOE */ ixgbe_init_interrupt_scheme(adapter); @@ -177,7 +180,10 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) adapter->ring_feature[RING_F_FCOE].indices = 0; netdev->features &= ~NETIF_F_FCOE_CRC; netdev->features &= ~NETIF_F_FSO; + netdev->vlan_features &= ~NETIF_F_FCOE_CRC; + netdev->vlan_features &= ~NETIF_F_FSO; netdev->fcoe_ddp_xid = 0; + netdev_features_change(netdev); } #endif /* IXGBE_FCOE */ ixgbe_init_interrupt_scheme(adapter);