diff --git a/[refs] b/[refs] index 70778ac340fe..01a2d50de654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e66dd19092497f566e4dda1664688e28fa667265 +refs/heads/master: 11ff5f6affe9b75f115a900a5584db339d46002b diff --git a/trunk/fs/afs/netdevices.c b/trunk/fs/afs/netdevices.c index 49f189423063..7ad36506c256 100644 --- a/trunk/fs/afs/netdevices.c +++ b/trunk/fs/afs/netdevices.c @@ -20,8 +20,7 @@ int afs_get_MAC_address(u8 *mac, size_t maclen) struct net_device *dev; int ret = -ENODEV; - if (maclen != ETH_ALEN) - BUG(); + BUG_ON(maclen != ETH_ALEN); rtnl_lock(); dev = __dev_getfirstbyhwtype(&init_net, ARPHRD_ETHER);