diff options
| author | Auke Kok | 2006-08-28 23:56:16 +0200 |
|---|---|---|
| committer | Auke Kok | 2006-08-28 23:56:16 +0200 |
| commit | 8fc897b00a7d81ffaa24e18881c2d6b10698ab0b (patch) | |
| tree | 3dac8c72398e8a23228b2a5edd5c926c2a58675d /drivers/net/e1000/e1000_main.c | |
| parent | Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netde... (diff) | |
| download | kernel-qcow2-linux-8fc897b00a7d81ffaa24e18881c2d6b10698ab0b.tar.gz kernel-qcow2-linux-8fc897b00a7d81ffaa24e18881c2d6b10698ab0b.tar.xz kernel-qcow2-linux-8fc897b00a7d81ffaa24e18881c2d6b10698ab0b.zip | |
e1000: Whitespace cleanup, cosmetic changes
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 0cf9ff2462ba..610a0cdbb68b 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2439,10 +2439,9 @@ e1000_watchdog(unsigned long data) * disable receives in the ISR and * reset device here in the watchdog */ - if (adapter->hw.mac_type == e1000_80003es2lan) { + if (adapter->hw.mac_type == e1000_80003es2lan) /* reset device */ schedule_work(&adapter->reset_task); - } } e1000_smartspeed(adapter); @@ -3677,7 +3676,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, E1000_DBG("%s: Receive packet consumed multiple" " buffers\n", netdev->name); /* recycle */ - buffer_info-> skb = skb; + buffer_info->skb = skb; goto next_desc; } |