* [net 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-04-30 23:16 Jeff Kirsher
2012-04-30 23:16 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jeff Kirsher @ 2012-04-30 23:16 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains fixes for igbvf and ixgbe.
The following are changes since commit 1cebce36d660c83bd1353e41f3e66abd4686f215:
tcp: fix infinite cwnd in tcp_complete_cwr()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
Alexander Duyck (1):
ixgbe: Fix a memory leak in IEEE DCB
Shan Wei (1):
igbvf: fix the bug when initializing the igbvf
Yi Zou (1):
ixgbe: fix calling skb_put on nonlinear skb assertion bug
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +++++----
3 files changed, 8 insertions(+), 6 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 6+ messages in thread* [net 1/3] igbvf: fix the bug when initializing the igbvf
2012-04-30 23:16 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-04-30 23:16 ` Jeff Kirsher
2012-05-01 1:48 ` Shan Wei
2012-04-30 23:16 ` [net 2/3] ixgbe: Fix a memory leak in IEEE DCB Jeff Kirsher
2012-04-30 23:16 ` [net 3/3] ixgbe: fix calling skb_put on nonlinear skb assertion bug Jeff Kirsher
2 siblings, 1 reply; 6+ messages in thread
From: Jeff Kirsher @ 2012-04-30 23:16 UTC (permalink / raw)
To: davem
Cc: Shan Wei, netdev, gospo, sassmann, Samuel Liao, Shan Wei,
Jeff Kirsher
From: Shan Wei <shanwei88@gmail.com>
Maybe it's a typo, but it cause that igbvf can't be initialized successfully.
Set perm_addr value using valid dev_addr, although which is equal to hw.mac.addr.
Signed-off-by: Samuel Liao <samuelliao@tencent.com>
Signed-off-by: Shan Wei <davidshan@tencent.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index d61ca2a..8ec74b0 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2731,14 +2731,14 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
netdev->addr_len);
}
- if (!is_valid_ether_addr(netdev->perm_addr)) {
+ if (!is_valid_ether_addr(netdev->dev_addr)) {
dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
netdev->dev_addr);
err = -EIO;
goto err_hw_init;
}
- memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+ memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
(unsigned long) adapter);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [net 1/3] igbvf: fix the bug when initializing the igbvf
2012-04-30 23:16 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
@ 2012-05-01 1:48 ` Shan Wei
0 siblings, 0 replies; 6+ messages in thread
From: Shan Wei @ 2012-05-01 1:48 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, gospo, sassmann, Samuel Liao, Shan Wei
Jeff Kirsher said, at 2012/5/1 7:16:
> From: Shan Wei <shanwei88@gmail.com>
The "From" tag will be wrote in git log as Author of this patch.
It should be "From: Samuel Liao <samuelliao@tencent.com>", not me.
So, please resubmit it to David Miller.
Thanks.
>
> Maybe it's a typo, but it cause that igbvf can't be initialized successfully.
> Set perm_addr value using valid dev_addr, although which is equal to hw.mac.addr.
>
> Signed-off-by: Samuel Liao <samuelliao@tencent.com>
> Signed-off-by: Shan Wei <davidshan@tencent.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net 2/3] ixgbe: Fix a memory leak in IEEE DCB
2012-04-30 23:16 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-30 23:16 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
@ 2012-04-30 23:16 ` Jeff Kirsher
2012-04-30 23:16 ` [net 3/3] ixgbe: fix calling skb_put on nonlinear skb assertion bug Jeff Kirsher
2 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2012-04-30 23:16 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, sassmann, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
The driver was freeing memory in shutdown instead of remove. As a result
we were leaking memory if IEEE DCB was enabled and we loaded/unloaded the
driver. This change moves the freeing of the memory into the remove
routine where it belongs.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a7f3cd8..88f6b2e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4873,10 +4873,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
}
ixgbe_clear_interrupt_scheme(adapter);
-#ifdef CONFIG_DCB
- kfree(adapter->ixgbe_ieee_pfc);
- kfree(adapter->ixgbe_ieee_ets);
-#endif
#ifdef CONFIG_PM
retval = pci_save_state(pdev);
@@ -7224,6 +7220,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
ixgbe_release_hw_control(adapter);
+#ifdef CONFIG_DCB
+ kfree(adapter->ixgbe_ieee_pfc);
+ kfree(adapter->ixgbe_ieee_ets);
+
+#endif
iounmap(adapter->hw.hw_addr);
pci_release_selected_regions(pdev, pci_select_bars(pdev,
IORESOURCE_MEM));
--
1.7.7.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net 3/3] ixgbe: fix calling skb_put on nonlinear skb assertion bug
2012-04-30 23:16 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-30 23:16 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
2012-04-30 23:16 ` [net 2/3] ixgbe: Fix a memory leak in IEEE DCB Jeff Kirsher
@ 2012-04-30 23:16 ` Jeff Kirsher
2 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2012-04-30 23:16 UTC (permalink / raw)
To: davem; +Cc: Yi Zou, netdev, gospo, sassmann, Jeff Kirsher
From: Yi Zou <yi.zou@intel.com>
With the support to bounce buffer added, the skb is coming as nonlinear in the
case of non-DDPed data frames for FCoE, which is mostly ok as the FCoE stack
would take care of that. However, for target mode, we have to set the FC CRC
and FC EOF field to allow the protocol stack to not drop the frame for the last
data frame of that sequence. So fix this by linearizing the skb first before
doing skb_put().
Signed-off-by: Yi Zou <yi.zou@intel.com>
Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index 77ea4b7..bc07933 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -437,6 +437,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
*/
if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
(fctl & FC_FC_END_SEQ)) {
+ skb_linearize(skb);
crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
crc->fcoe_eof = FC_EOF_T;
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net v2 0/3][pull request] Intel Wired LAN Driver Updates
@ 2012-05-01 1:58 Jeff Kirsher
2012-05-01 1:58 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Kirsher @ 2012-05-01 1:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains fixes for igbvf and ixgbe.
v2: Corrected authorship for the igbvf patch to Samuel Liao.
The following are changes since commit 1cebce36d660c83bd1353e41f3e66abd4686f215:
tcp: fix infinite cwnd in tcp_complete_cwr()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
Alexander Duyck (1):
ixgbe: Fix a memory leak in IEEE DCB
Samuel Liao (1):
igbvf: fix the bug when initializing the igbvf
Yi Zou (1):
ixgbe: fix calling skb_put on nonlinear skb assertion bug
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +++++----
3 files changed, 8 insertions(+), 6 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net 1/3] igbvf: fix the bug when initializing the igbvf
2012-05-01 1:58 [net v2 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-05-01 1:58 ` Jeff Kirsher
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2012-05-01 1:58 UTC (permalink / raw)
To: davem; +Cc: Samuel Liao, netdev, gospo, sassmann, Shan Wei, Jeff Kirsher
From: Samuel Liao <samuelliao@tencent.com>
Maybe it's a typo, but it cause that igbvf can't be initialized successfully.
Set perm_addr value using valid dev_addr, although which is equal to hw.mac.addr.
Signed-off-by: Samuel Liao <samuelliao@tencent.com>
Signed-off-by: Shan Wei <davidshan@tencent.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index d61ca2a..8ec74b0 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2731,14 +2731,14 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
netdev->addr_len);
}
- if (!is_valid_ether_addr(netdev->perm_addr)) {
+ if (!is_valid_ether_addr(netdev->dev_addr)) {
dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
netdev->dev_addr);
err = -EIO;
goto err_hw_init;
}
- memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+ memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
(unsigned long) adapter);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-01 1:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-30 23:16 [net 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-30 23:16 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
2012-05-01 1:48 ` Shan Wei
2012-04-30 23:16 ` [net 2/3] ixgbe: Fix a memory leak in IEEE DCB Jeff Kirsher
2012-04-30 23:16 ` [net 3/3] ixgbe: fix calling skb_put on nonlinear skb assertion bug Jeff Kirsher
-- strict thread matches above, loose matches on Subject: below --
2012-05-01 1:58 [net v2 0/3][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-01 1:58 ` [net 1/3] igbvf: fix the bug when initializing the igbvf Jeff Kirsher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).