From 9ea2bc81d47e31be26792340856cab5c7d817e77 Mon Sep 17 00:00:00 2001 From: Vasanthy Kolluri Date: Wed, 20 Oct 2010 10:17:04 +0000 Subject: [PATCH] --- yaml --- r: 215377 b: refs/heads/master c: c76fd32d0504c0450edb0e00890aa32e3ff1f73d h: refs/heads/master i: 215375: 7324759114cc1b549052c56e10e931c9f28bd30e v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/enic_main.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 18bfb3a7f0de..a60d44953ebb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 717258ba4b3ecca9c7c0ef2b76d7aa5800242bad +refs/heads/master: c76fd32d0504c0450edb0e00890aa32e3ff1f73d diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index dcfc541291ef..622106d8c055 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -974,8 +974,19 @@ static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p) static int enic_set_mac_address(struct net_device *netdev, void *p) { struct sockaddr *saddr = p; + char *addr = saddr->sa_data; + struct enic *enic = netdev_priv(netdev); + int err; + + err = enic_dev_del_station_addr(enic); + if (err) + return err; + + err = enic_set_mac_addr(netdev, addr); + if (err) + return err; - return enic_set_mac_addr(netdev, (char *)saddr->sa_data); + return enic_dev_add_station_addr(enic); } static int enic_dev_packet_filter(struct enic *enic, int directed,