diff --git a/[refs] b/[refs] index 6c71aa3012b5..fb36a05551e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85e6b8c5d8be1e901b5402bfe42ce408912ab83e +refs/heads/master: 8da83f8e73a42fa3142843938aa1590b82acb6ec diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h index aee5256e522b..e816bbb9fbf9 100644 --- a/trunk/drivers/net/enic/enic.h +++ b/trunk/drivers/net/enic/enic.h @@ -32,7 +32,7 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "2.1.1.9" +#define DRV_VERSION "2.1.1.10" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index 4f1710e31eb4..8b9cad5e9712 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -1126,6 +1126,8 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac) if (err) return err; + enic_reset_addr_lists(enic); + switch (enic->pp.request) { case PORT_REQUEST_ASSOCIATE: