summaryrefslogtreecommitdiffstats
path: root/drivers/net/pppoe.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-18 13:29:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-18 13:29:26 -0700
commit3a5c3743f15f27237ab025736a981e2d0c9fdfed (patch)
tree13fc4d89901c2e2e187cfb44ab904bc587b0ab9c /drivers/net/pppoe.c
parentdc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6 (diff)
parent680ba7ca630f5816af9c80a946520be76b2167a5 (diff)
downloadlinux-3a5c3743f15f27237ab025736a981e2d0c9fdfed.tar.gz
linux-3a5c3743f15f27237ab025736a981e2d0c9fdfed.tar.bz2
linux-3a5c3743f15f27237ab025736a981e2d0c9fdfed.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: pppoe: Must flush connections when MAC address changes too. include/linux/sdla.h: remove the prototype of sdla() tulip: dmfe: Remove old log spamming pr_debugs
Diffstat (limited to 'drivers/net/pppoe.c')
-rw-r--r--drivers/net/pppoe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 718879b35b7d..bc9a4bb31980 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -348,8 +348,9 @@ static int pppoe_device_event(struct notifier_block *this,
/* Only look at sockets that are using this specific device. */
switch (event) {
+ case NETDEV_CHANGEADDR:
case NETDEV_CHANGEMTU:
- /* A change in mtu is a bad thing, requiring
+ /* A change in mtu or address is a bad thing, requiring
* LCP re-negotiation.
*/