diff options
Diffstat (limited to 'team-net-next-update-20120924.patch')
| -rw-r--r-- | team-net-next-update-20120924.patch | 499 |
1 files changed, 0 insertions, 499 deletions
diff --git a/team-net-next-update-20120924.patch b/team-net-next-update-20120924.patch deleted file mode 100644 index c0899c5aa..000000000 --- a/team-net-next-update-20120924.patch +++ /dev/null @@ -1,499 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.59.1.102 with SMTP id bf6csp906180ved; - Sun, 23 Sep 2012 23:03:07 -0700 (PDT) -Received: by 10.68.239.5 with SMTP id vo5mr33801766pbc.102.1348466586432; - Sun, 23 Sep 2012 23:03:06 -0700 (PDT) -Return-Path: <kernel-bounces@lists.fedoraproject.org> -Received: from bastion.fedoraproject.org (bastion01.fedoraproject.org. [209.132.181.2]) - by mx.google.com with ESMTP id s5si6031726pay.21.2012.09.23.23.03.04; - Sun, 23 Sep 2012 23:03:06 -0700 (PDT) -Received-SPF: pass (google.com: domain of kernel-bounces@lists.fedoraproject.org designates 209.132.181.2 as permitted sender) client-ip=209.132.181.2; -Authentication-Results: mx.google.com; spf=pass (google.com: domain of kernel-bounces@lists.fedoraproject.org designates 209.132.181.2 as permitted sender) smtp.mail=kernel-bounces@lists.fedoraproject.org -Received: from lists.fedoraproject.org (collab03.vpn.fedoraproject.org [192.168.1.70]) - by bastion01.phx2.fedoraproject.org (Postfix) with ESMTP id 4185D224F5; - Mon, 24 Sep 2012 06:03:03 +0000 (UTC) -Received: from collab03.fedoraproject.org (localhost [127.0.0.1]) - by lists.fedoraproject.org (Postfix) with ESMTP id E30B53FCF8; - Mon, 24 Sep 2012 06:03:02 +0000 (UTC) -X-Original-To: kernel@lists.fedoraproject.org -Delivered-To: kernel@lists.fedoraproject.org -Received: from smtp-mm02.fedoraproject.org (smtp-mm02.fedoraproject.org - [66.35.62.164]) - by lists.fedoraproject.org (Postfix) with ESMTP id 7F9D03FCF8 - for <kernel@lists.fedoraproject.org>; - Mon, 24 Sep 2012 06:03:00 +0000 (UTC) -Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) - by smtp-mm02.fedoraproject.org (Postfix) with ESMTP id 3A0AA3FC66 - for <kernel@lists.fedoraproject.org>; - Mon, 24 Sep 2012 06:03:00 +0000 (UTC) -Received: from int-mx11.intmail.prod.int.phx2.redhat.com - (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8O62uU3010033 - (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); - Mon, 24 Sep 2012 02:02:59 -0400 -Received: from localhost (ovpn-116-32.ams2.redhat.com [10.36.116.32]) - by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP - id q8O62sNM029515; Mon, 24 Sep 2012 02:02:55 -0400 -From: Jiri Pirko <jpirko@redhat.com> -To: kernel@lists.fedoraproject.org -Subject: [patch F18/rawhide] team: update to latest net-next -Date: Mon, 24 Sep 2012 08:02:54 +0200 -Message-Id: <1348466574-1982-1-git-send-email-jpirko@redhat.com> -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 -Cc: brouer@redhat.com, jforbes@redhat.com, jwboyer@redhat.com -X-BeenThere: kernel@lists.fedoraproject.org -X-Mailman-Version: 2.1.12 -Precedence: list -List-Id: "Fedora kernel development." <kernel.lists.fedoraproject.org> -List-Unsubscribe: <https://admin.fedoraproject.org/mailman/options/kernel>, - <mailto:kernel-request@lists.fedoraproject.org?subject=unsubscribe> -List-Archive: <http://lists.fedoraproject.org/pipermail/kernel/> -List-Post: <mailto:kernel@lists.fedoraproject.org> -List-Help: <mailto:kernel-request@lists.fedoraproject.org?subject=help> -List-Subscribe: <https://admin.fedoraproject.org/mailman/listinfo/kernel>, - <mailto:kernel-request@lists.fedoraproject.org?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: base64 -Sender: kernel-bounces@lists.fedoraproject.org -Errors-To: kernel-bounces@lists.fedoraproject.org - -Update team driver to latest net-next. - -Split patches available here: -http://people.redhat.com/jpirko/f18_team_update_3/ - -Jiri Pirko (5): - team: add support for non-ethernet devices - team: don't print warn message on -ESRCH during event send - vlan: add helper which can be called to see if device is used by vlan - team: do not allow to add VLAN challenged port when vlan is used - team: send port changed when added - - drivers/net/team/Kconfig | 4 +- - drivers/net/team/team.c | 137 ++++++++++++++++++++++++-------- - drivers/net/team/team_mode_broadcast.c | 8 +- - drivers/net/team/team_mode_roundrobin.c | 8 +- - include/linux/if_team.h | 4 +- - include/linux/if_vlan.h | 9 ++- - net/8021q/vlan_core.c | 6 ++ - 7 files changed, 128 insertions(+), 48 deletions(-) - -Signed-off-by: Jiri Pirko <jpirko@redhat.com> - -diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig -index 6a7260b..6b08bd4 100644 ---- a/drivers/net/team/Kconfig -+++ b/drivers/net/team/Kconfig -@@ -21,7 +21,7 @@ config NET_TEAM_MODE_BROADCAST - ---help--- - Basic mode where packets are transmitted always by all suitable ports. - -- All added ports are setup to have team's mac address. -+ All added ports are setup to have team's device address. - - To compile this team mode as a module, choose M here: the module - will be called team_mode_broadcast. -@@ -33,7 +33,7 @@ config NET_TEAM_MODE_ROUNDROBIN - Basic mode where port used for transmitting packets is selected in - round-robin fashion using packet counter. - -- All added ports are setup to have team's mac address. -+ All added ports are setup to have team's device address. - - To compile this team mode as a module, choose M here: the module - will be called team_mode_roundrobin. -diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c -index 341b65d..17d4be3 100644 ---- a/drivers/net/team/team.c -+++ b/drivers/net/team/team.c -@@ -54,29 +54,29 @@ static struct team_port *team_port_get_rtnl(const struct net_device *dev) - } - - /* -- * Since the ability to change mac address for open port device is tested in -+ * Since the ability to change device address for open port device is tested in - * team_port_add, this function can be called without control of return value - */ --static int __set_port_mac(struct net_device *port_dev, -- const unsigned char *dev_addr) -+static int __set_port_dev_addr(struct net_device *port_dev, -+ const unsigned char *dev_addr) - { - struct sockaddr addr; - -- memcpy(addr.sa_data, dev_addr, ETH_ALEN); -- addr.sa_family = ARPHRD_ETHER; -+ memcpy(addr.sa_data, dev_addr, port_dev->addr_len); -+ addr.sa_family = port_dev->type; - return dev_set_mac_address(port_dev, &addr); - } - --static int team_port_set_orig_mac(struct team_port *port) -+static int team_port_set_orig_dev_addr(struct team_port *port) - { -- return __set_port_mac(port->dev, port->orig.dev_addr); -+ return __set_port_dev_addr(port->dev, port->orig.dev_addr); - } - --int team_port_set_team_mac(struct team_port *port) -+int team_port_set_team_dev_addr(struct team_port *port) - { -- return __set_port_mac(port->dev, port->team->dev->dev_addr); -+ return __set_port_dev_addr(port->dev, port->team->dev->dev_addr); - } --EXPORT_SYMBOL(team_port_set_team_mac); -+EXPORT_SYMBOL(team_port_set_team_dev_addr); - - static void team_refresh_port_linkup(struct team_port *port) - { -@@ -848,7 +848,10 @@ static struct netpoll_info *team_netpoll_info(struct team *team) - } - #endif - --static void __team_port_change_check(struct team_port *port, bool linkup); -+static void __team_port_change_port_added(struct team_port *port, bool linkup); -+ -+static int team_dev_type_check_change(struct net_device *dev, -+ struct net_device *port_dev); - - static int team_port_add(struct team *team, struct net_device *port_dev) - { -@@ -857,9 +860,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev) - char *portname = port_dev->name; - int err; - -- if (port_dev->flags & IFF_LOOPBACK || -- port_dev->type != ARPHRD_ETHER) { -- netdev_err(dev, "Device %s is of an unsupported type\n", -+ if (port_dev->flags & IFF_LOOPBACK) { -+ netdev_err(dev, "Device %s is loopback device. Loopback devices can't be added as a team port\n", - portname); - return -EINVAL; - } -@@ -870,6 +872,17 @@ static int team_port_add(struct team *team, struct net_device *port_dev) - return -EBUSY; - } - -+ if (port_dev->features & NETIF_F_VLAN_CHALLENGED && -+ vlan_uses_dev(dev)) { -+ netdev_err(dev, "Device %s is VLAN challenged and team device has VLAN set up\n", -+ portname); -+ return -EPERM; -+ } -+ -+ err = team_dev_type_check_change(dev, port_dev); -+ if (err) -+ return err; -+ - if (port_dev->flags & IFF_UP) { - netdev_err(dev, "Device %s is up. Set it down before adding it as a team port\n", - portname); -@@ -891,7 +904,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) - goto err_set_mtu; - } - -- memcpy(port->orig.dev_addr, port_dev->dev_addr, ETH_ALEN); -+ memcpy(port->orig.dev_addr, port_dev->dev_addr, port_dev->addr_len); - - err = team_port_enter(team, port); - if (err) { -@@ -948,7 +961,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) - team_port_enable(team, port); - list_add_tail_rcu(&port->list, &team->port_list); - __team_compute_features(team); -- __team_port_change_check(port, !!netif_carrier_ok(port_dev)); -+ __team_port_change_port_added(port, !!netif_carrier_ok(port_dev)); - __team_options_change_check(team); - - netdev_info(dev, "Port device %s added\n", portname); -@@ -972,7 +985,7 @@ err_vids_add: - - err_dev_open: - team_port_leave(team, port); -- team_port_set_orig_mac(port); -+ team_port_set_orig_dev_addr(port); - - err_port_enter: - dev_set_mtu(port_dev, port->orig.mtu); -@@ -983,6 +996,8 @@ err_set_mtu: - return err; - } - -+static void __team_port_change_port_removed(struct team_port *port); -+ - static int team_port_del(struct team *team, struct net_device *port_dev) - { - struct net_device *dev = team->dev; -@@ -999,8 +1014,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev) - __team_option_inst_mark_removed_port(team, port); - __team_options_change_check(team); - __team_option_inst_del_port(team, port); -- port->removed = true; -- __team_port_change_check(port, false); -+ __team_port_change_port_removed(port); - team_port_disable(team, port); - list_del_rcu(&port->list); - netdev_rx_handler_unregister(port_dev); -@@ -1009,7 +1023,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev) - vlan_vids_del_by_dev(port_dev, dev); - dev_close(port_dev); - team_port_leave(team, port); -- team_port_set_orig_mac(port); -+ team_port_set_orig_dev_addr(port); - dev_set_mtu(port_dev, port->orig.mtu); - synchronize_rcu(); - kfree(port); -@@ -1295,17 +1309,18 @@ static void team_set_rx_mode(struct net_device *dev) - - static int team_set_mac_address(struct net_device *dev, void *p) - { -+ struct sockaddr *addr = p; - struct team *team = netdev_priv(dev); - struct team_port *port; -- int err; - -- err = eth_mac_addr(dev, p); -- if (err) -- return err; -+ if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data)) -+ return -EADDRNOTAVAIL; -+ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); -+ dev->addr_assign_type &= ~NET_ADDR_RANDOM; - rcu_read_lock(); - list_for_each_entry_rcu(port, &team->port_list, list) -- if (team->ops.port_change_mac) -- team->ops.port_change_mac(team, port); -+ if (team->ops.port_change_dev_addr) -+ team->ops.port_change_dev_addr(team, port); - rcu_read_unlock(); - return 0; - } -@@ -1536,6 +1551,45 @@ static const struct net_device_ops team_netdev_ops = { - * rt netlink interface - ***********************/ - -+static void team_setup_by_port(struct net_device *dev, -+ struct net_device *port_dev) -+{ -+ dev->header_ops = port_dev->header_ops; -+ dev->type = port_dev->type; -+ dev->hard_header_len = port_dev->hard_header_len; -+ dev->addr_len = port_dev->addr_len; -+ dev->mtu = port_dev->mtu; -+ memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len); -+ memcpy(dev->dev_addr, port_dev->dev_addr, port_dev->addr_len); -+ dev->addr_assign_type &= ~NET_ADDR_RANDOM; -+} -+ -+static int team_dev_type_check_change(struct net_device *dev, -+ struct net_device *port_dev) -+{ -+ struct team *team = netdev_priv(dev); -+ char *portname = port_dev->name; -+ int err; -+ -+ if (dev->type == port_dev->type) -+ return 0; -+ if (!list_empty(&team->port_list)) { -+ netdev_err(dev, "Device %s is of different type\n", portname); -+ return -EBUSY; -+ } -+ err = call_netdevice_notifiers(NETDEV_PRE_TYPE_CHANGE, dev); -+ err = notifier_to_errno(err); -+ if (err) { -+ netdev_err(dev, "Refused to change device type\n"); -+ return err; -+ } -+ dev_uc_flush(dev); -+ dev_mc_flush(dev); -+ team_setup_by_port(dev, port_dev); -+ call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev); -+ return 0; -+} -+ - static void team_setup(struct net_device *dev) - { - ether_setup(dev); -@@ -2245,19 +2299,17 @@ static void __team_options_change_check(struct team *team) - list_add_tail(&opt_inst->tmp_list, &sel_opt_inst_list); - } - err = team_nl_send_event_options_get(team, &sel_opt_inst_list); -- if (err) -+ if (err && err != -ESRCH) - netdev_warn(team->dev, "Failed to send options change via netlink (err %d)\n", - err); - } - - /* rtnl lock is held */ --static void __team_port_change_check(struct team_port *port, bool linkup) -+ -+static void __team_port_change_send(struct team_port *port, bool linkup) - { - int err; - -- if (!port->removed && port->state.linkup == linkup) -- return; -- - port->changed = true; - port->state.linkup = linkup; - team_refresh_port_linkup(port); -@@ -2276,12 +2328,29 @@ static void __team_port_change_check(struct team_port *port, bool linkup) - - send_event: - err = team_nl_send_event_port_list_get(port->team); -- if (err) -- netdev_warn(port->team->dev, "Failed to send port change of device %s via netlink\n", -- port->dev->name); -+ if (err && err != -ESRCH) -+ netdev_warn(port->team->dev, "Failed to send port change of device %s via netlink (err %d)\n", -+ port->dev->name, err); - - } - -+static void __team_port_change_check(struct team_port *port, bool linkup) -+{ -+ if (port->state.linkup != linkup) -+ __team_port_change_send(port, linkup); -+} -+ -+static void __team_port_change_port_added(struct team_port *port, bool linkup) -+{ -+ __team_port_change_send(port, linkup); -+} -+ -+static void __team_port_change_port_removed(struct team_port *port) -+{ -+ port->removed = true; -+ __team_port_change_send(port, false); -+} -+ - static void team_port_change_check(struct team_port *port, bool linkup) - { - struct team *team = port->team; -diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c -index c96e4d2..9db0171 100644 ---- a/drivers/net/team/team_mode_broadcast.c -+++ b/drivers/net/team/team_mode_broadcast.c -@@ -48,18 +48,18 @@ static bool bc_transmit(struct team *team, struct sk_buff *skb) - - static int bc_port_enter(struct team *team, struct team_port *port) - { -- return team_port_set_team_mac(port); -+ return team_port_set_team_dev_addr(port); - } - --static void bc_port_change_mac(struct team *team, struct team_port *port) -+static void bc_port_change_dev_addr(struct team *team, struct team_port *port) - { -- team_port_set_team_mac(port); -+ team_port_set_team_dev_addr(port); - } - - static const struct team_mode_ops bc_mode_ops = { - .transmit = bc_transmit, - .port_enter = bc_port_enter, -- .port_change_mac = bc_port_change_mac, -+ .port_change_dev_addr = bc_port_change_dev_addr, - }; - - static const struct team_mode bc_mode = { -diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c -index ad7ed0e..105135a 100644 ---- a/drivers/net/team/team_mode_roundrobin.c -+++ b/drivers/net/team/team_mode_roundrobin.c -@@ -66,18 +66,18 @@ drop: - - static int rr_port_enter(struct team *team, struct team_port *port) - { -- return team_port_set_team_mac(port); -+ return team_port_set_team_dev_addr(port); - } - --static void rr_port_change_mac(struct team *team, struct team_port *port) -+static void rr_port_change_dev_addr(struct team *team, struct team_port *port) - { -- team_port_set_team_mac(port); -+ team_port_set_team_dev_addr(port); - } - - static const struct team_mode_ops rr_mode_ops = { - .transmit = rr_transmit, - .port_enter = rr_port_enter, -- .port_change_mac = rr_port_change_mac, -+ .port_change_dev_addr = rr_port_change_dev_addr, - }; - - static const struct team_mode rr_mode = { -diff --git a/include/linux/if_team.h b/include/linux/if_team.h -index aa2e167..667f2a5 100644 ---- a/include/linux/if_team.h -+++ b/include/linux/if_team.h -@@ -105,7 +105,7 @@ struct team_mode_ops { - bool (*transmit)(struct team *team, struct sk_buff *skb); - int (*port_enter)(struct team *team, struct team_port *port); - void (*port_leave)(struct team *team, struct team_port *port); -- void (*port_change_mac)(struct team *team, struct team_port *port); -+ void (*port_change_dev_addr)(struct team *team, struct team_port *port); - void (*port_enabled)(struct team *team, struct team_port *port); - void (*port_disabled)(struct team *team, struct team_port *port); - }; -@@ -231,7 +231,7 @@ static inline struct team_port *team_get_port_by_index_rcu(struct team *team, - return NULL; - } - --extern int team_port_set_team_mac(struct team_port *port); -+extern int team_port_set_team_dev_addr(struct team_port *port); - extern int team_options_register(struct team *team, - const struct team_option *option, - size_t option_count); -diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h -index a810987..e6ff12d 100644 ---- a/include/linux/if_vlan.h -+++ b/include/linux/if_vlan.h -@@ -74,8 +74,6 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb) - /* found in socket.c */ - extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *)); - --struct vlan_info; -- - static inline int is_vlan_dev(struct net_device *dev) - { - return dev->priv_flags & IFF_802_1Q_VLAN; -@@ -101,6 +99,8 @@ extern int vlan_vids_add_by_dev(struct net_device *dev, - const struct net_device *by_dev); - extern void vlan_vids_del_by_dev(struct net_device *dev, - const struct net_device *by_dev); -+ -+extern bool vlan_uses_dev(const struct net_device *dev); - #else - static inline struct net_device * - __vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id) -@@ -151,6 +151,11 @@ static inline void vlan_vids_del_by_dev(struct net_device *dev, - const struct net_device *by_dev) - { - } -+ -+static inline bool vlan_uses_dev(const struct net_device *dev) -+{ -+ return false; -+} - #endif - - /** -diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c -index 8ca533c..b258da8 100644 ---- a/net/8021q/vlan_core.c -+++ b/net/8021q/vlan_core.c -@@ -368,3 +368,9 @@ void vlan_vids_del_by_dev(struct net_device *dev, - vlan_vid_del(dev, vid_info->vid); - } - EXPORT_SYMBOL(vlan_vids_del_by_dev); -+ -+bool vlan_uses_dev(const struct net_device *dev) -+{ -+ return rtnl_dereference(dev->vlan_info) ? true : false; -+} -+EXPORT_SYMBOL(vlan_uses_dev); - |