| Message ID | 20121203221732.GA14494@casper.infradead.org |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Dec 3, 2012 at 2:17 PM, Thomas Graf <tgraf@suug.ch> wrote: > > bonus: if we ever are to use IFF_LIVE_ADDR_CHANGE for > anything further than to check availability in eth_mac_addr(), > Open vSwitch will be ready for that. > > Signed-off-by: Thomas Graf <tgraf@suug.ch> There's no need to send this patch twice (especially to a different set of people). I'm currently reviewing a large patchset that was submitted before yours. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/03/12 at 02:36pm, Jesse Gross wrote: > On Mon, Dec 3, 2012 at 2:17 PM, Thomas Graf <tgraf@suug.ch> wrote: > > > > bonus: if we ever are to use IFF_LIVE_ADDR_CHANGE for > > anything further than to check availability in eth_mac_addr(), > > Open vSwitch will be ready for that. > > > > Signed-off-by: Thomas Graf <tgraf@suug.ch> > > There's no need to send this patch twice (especially to a different > set of people). I'm currently reviewing a large patchset that was > submitted before yours. It's a trivial patch, you seemed busy and we might as well make use of the open net-next window. I see nothing wrong with that. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 3, 2012 at 2:47 PM, Thomas Graf <tgraf@suug.ch> wrote: > On 12/03/12 at 02:36pm, Jesse Gross wrote: >> On Mon, Dec 3, 2012 at 2:17 PM, Thomas Graf <tgraf@suug.ch> wrote: >> > >> > bonus: if we ever are to use IFF_LIVE_ADDR_CHANGE for >> > anything further than to check availability in eth_mac_addr(), >> > Open vSwitch will be ready for that. >> > >> > Signed-off-by: Thomas Graf <tgraf@suug.ch> >> >> There's no need to send this patch twice (especially to a different >> set of people). I'm currently reviewing a large patchset that was >> submitted before yours. > > It's a trivial patch, you seemed busy and we might as well make use > of the open net-next window. I see nothing wrong with that. If you send patches like this to two different trees then it will result in merge conflicts later. Please just wait a few days; as you say, it's a trivial patch. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/03/12 at 02:55pm, Jesse Gross wrote: > If you send patches like this to two different trees then it will > result in merge conflicts later. Please just wait a few days; as you > say, it's a trivial patch. I CC'ed dev@openvswitch.org on both patch submissions as well so if davem merges it you will know. It's no the lack of response to this patch but the discontinuation of discussion on the previous patchset without any reason that gave me the impression of being ignored. When I feel ignored, I go somehwere else. Besides, it would have taken less time to just apply the patch than to have this discussion. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 3, 2012 at 2:17 PM, Thomas Graf <tgraf@suug.ch> wrote: > > bonus: if we ever are to use IFF_LIVE_ADDR_CHANGE for > anything further than to check availability in eth_mac_addr(), > Open vSwitch will be ready for that. > > Signed-off-by: Thomas Graf <tgraf@suug.ch> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 5d460c3..90816c7 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -63,17 +63,6 @@ static struct rtnl_link_stats64 *internal_dev_get_stats(struct net_device *netde return stats; } -static int internal_dev_mac_addr(struct net_device *dev, void *p) -{ - struct sockaddr *addr = p; - - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - dev->addr_assign_type &= ~NET_ADDR_RANDOM; - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); - return 0; -} - /* Called with rcu_read_lock_bh. */ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { @@ -127,7 +116,7 @@ static const struct net_device_ops internal_dev_netdev_ops = { .ndo_open = internal_dev_open, .ndo_stop = internal_dev_stop, .ndo_start_xmit = internal_dev_xmit, - .ndo_set_mac_address = internal_dev_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = internal_dev_change_mtu, .ndo_get_stats64 = internal_dev_get_stats, }; @@ -139,6 +128,7 @@ static void do_setup(struct net_device *netdev) netdev->netdev_ops = &internal_dev_netdev_ops; netdev->priv_flags &= ~IFF_TX_SKB_SHARING; + netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; netdev->destructor = internal_dev_destructor; SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); netdev->tx_queue_len = 0;
bonus: if we ever are to use IFF_LIVE_ADDR_CHANGE for anything further than to check availability in eth_mac_addr(), Open vSwitch will be ready for that. Signed-off-by: Thomas Graf <tgraf@suug.ch> --- net/openvswitch/vport-internal_dev.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html