diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /fs/afs/netdevices.c | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'fs/afs/netdevices.c')
| -rw-r--r-- | fs/afs/netdevices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/afs/netdevices.c b/fs/afs/netdevices.c index 49f189423063..7ad36506c256 100644 --- a/fs/afs/netdevices.c +++ b/fs/afs/netdevices.c | |||
| @@ -20,8 +20,7 @@ int afs_get_MAC_address(u8 *mac, size_t maclen) | |||
| 20 | struct net_device *dev; | 20 | struct net_device *dev; |
| 21 | int ret = -ENODEV; | 21 | int ret = -ENODEV; |
| 22 | 22 | ||
| 23 | if (maclen != ETH_ALEN) | 23 | BUG_ON(maclen != ETH_ALEN); |
| 24 | BUG(); | ||
| 25 | 24 | ||
| 26 | rtnl_lock(); | 25 | rtnl_lock(); |
| 27 | dev = __dev_getfirstbyhwtype(&init_net, ARPHRD_ETHER); | 26 | dev = __dev_getfirstbyhwtype(&init_net, ARPHRD_ETHER); |