Re: [PATCH] prism54: remove duplicated .ndo_set_mac_address

Previous thread: [PATCH] drivers/net/b44.c: fix regressions in error recovery by Christiaan Welvaart on Sunday, March 29, 2009 - 6:25 am. (2 messages)

Next thread: [PATCH 1/10] Staging: at76: convert to netdev_ops by Alexander Beregalov on Sunday, March 29, 2009 - 8:23 am. (3 messages)
From: Alexander Beregalov
Date: Sunday, March 29, 2009 - 8:02 am

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

 drivers/net/wireless/prism54/islpci_dev.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 166ed95..e26d7b3 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -803,7 +803,6 @@ static const struct net_device_ops islpci_netdev_ops = {
 	.ndo_tx_timeout		= islpci_eth_tx_timeout,
 	.ndo_set_mac_address 	= prism54_set_mac_address,
 	.ndo_change_mtu		= eth_change_mtu,
-	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 };
 
--

From: Alexander Beregalov
Date: Sunday, March 29, 2009 - 8:16 am

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

 drivers/net/wireless/airo.c               |    2 --
 drivers/net/wireless/ipw2x00/ipw2200.c    |    1 -
 drivers/net/wireless/prism54/islpci_dev.c |    1 -
 drivers/net/wireless/zd1201.c             |    1 -
 4 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7e80aba..93302c0 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2752,7 +2752,6 @@ static const struct net_device_ops airo_netdev_ops = {
 	.ndo_set_mac_address	= airo_set_mac_address,
 	.ndo_do_ioctl		= airo_ioctl,
 	.ndo_change_mtu		= airo_change_mtu,
-	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 };
 
@@ -2765,7 +2764,6 @@ static const struct net_device_ops mpi_netdev_ops = {
 	.ndo_set_mac_address	= airo_set_mac_address,
 	.ndo_do_ioctl		= airo_ioctl,
 	.ndo_change_mtu		= airo_change_mtu,
-	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index b344994..4a92af1 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11593,7 +11593,6 @@ static const struct net_device_ops ipw_netdev_ops = {
 	.ndo_set_mac_address	= ipw_net_set_mac_address,
 	.ndo_start_xmit		= ieee80211_xmit,
 	.ndo_change_mtu		= ieee80211_change_mtu,
-	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 166ed95..e26d7b3 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -803,7 +803,6 @@ static const struct net_device_ops islpci_netdev_ops = {
 	.ndo_tx_timeout		= islpci_eth_tx_timeout,
 	.ndo_set_mac_address 	= prism54_set_mac_address,
 	.ndo_change_mtu		= ...
From: David Miller
Date: Sunday, March 29, 2009 - 1:52 pm

From: Alexander Beregalov <a.beregalov@gmail.com>

Applied, thanks Alexander.
--

From: Alexander Beregalov
Date: Sunday, March 29, 2009 - 8:18 am

Please apply next patch instead of this.
--

From: David Miller
Date: Sunday, March 29, 2009 - 1:51 pm

From: Alexander Beregalov <a.beregalov@gmail.com>

I don't see this next patch, where is it?

I only see the original version.
--

From: David Miller
Date: Sunday, March 29, 2009 - 1:51 pm

From: David Miller <davem@davemloft.net>

Nevermind, I see, you meant the "wireless: remove duplicated ..."
one.
--

Previous thread: [PATCH] drivers/net/b44.c: fix regressions in error recovery by Christiaan Welvaart on Sunday, March 29, 2009 - 6:25 am. (2 messages)

Next thread: [PATCH 1/10] Staging: at76: convert to netdev_ops by Alexander Beregalov on Sunday, March 29, 2009 - 8:23 am. (3 messages)