diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-06-24 12:43:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 12:43:40 -0700 |
| commit | d3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721 (patch) | |
| tree | 9e0c673cdc9817ccaf9b31f07116d6a586de25c5 /drivers/net/ethernet/apple/bmac.c | |
| parent | bnx2x: Fix compilation with no IOV support (diff) | |
| download | linux-dev-d3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721.tar.xz linux-dev-d3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721.zip | |
net: Restore unintentional reverts.
This restores commits:
c573972c111eb4c6b3f3250ad71e7c75cc799833
1a5904342c7380ceddd61c0b37544d752d0b1433
da2e2c214953f37c2a6be20226537ca5a329724c
which initially accidently went into 'net', were
reverted there, and then properly placed into 'net-next'.
But the next net --> net-next merge accidently wiped them
out again.
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apple/bmac.c')
| -rw-r--r-- | drivers/net/ethernet/apple/bmac.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 714dcfe3a469..a597b766f080 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c @@ -1016,7 +1016,6 @@ static void bmac_set_multicast(struct net_device *dev) static void bmac_set_multicast(struct net_device *dev) { struct netdev_hw_addr *ha; - int i; unsigned short rx_cfg; u32 crc; |