From 2ee7deb09a7cf7ba9321dfccf56ca87e0c6ff981 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Thu, 13 May 2010 15:25:33 +0000 Subject: [PATCH] --- yaml --- r: 195079 b: refs/heads/master c: 2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a h: refs/heads/master i: 195077: 9918190a22e61fb0d328076dbe6da2ce5f5521a7 195075: f884f6a7f42bb612cd51314965e50aed96070988 195071: 38bb1eab7bbbaeb5370b5450ff131200fb9d37ad v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81a3863f085b..7caffda6f901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4b770972b8f819e408d7cc3ae9637e15bff62f6 +refs/heads/master: 2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index f06c8975f886..5de738a6d0e6 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -2161,8 +2161,6 @@ static void e1000_set_rx_mode(struct net_device *netdev) e1000_rar_set(hw, ha->addr, i++); } - WARN_ON(i == rar_entries); - netdev_for_each_mc_addr(ha, netdev) { if (i == rar_entries) { /* load any remaining addresses into the hash table */