]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:33:18 +0000 (10:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:33:18 +0000 (10:33 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
  net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
  ixgbe: allow tx of pre-formatted vlan tagged packets
  ixgbe: Fix 82598 premature copper PHY link indicatation
  ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
  bcm63xx_enet: fix compilation failure after get_stats_count removal
  packet: dont call sleeping functions while holding rcu_read_lock()
  tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
  ipvs: zero usvc and udest
  netfilter: fix crashes in bridge netfilter caused by fragment jumps
  ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
  sky2: leave PCI config space writeable
  sky2: print Optima chip name
  x25: Update maintainer.
  ipvs: fix synchronization on connection close
  netfilter: xtables: document minimal required version
  drivers/net/bonding/: : use pr_fmt
  can: CAN_MCP251X should depend on HAS_DMA
  drivers/net/usb: Correct code taking the size of a pointer
  drivers/net/cpmac.c: Correct code taking the size of a pointer
  drivers/net/sfc: Correct code taking the size of a pointer
  ...

52 files changed:
Documentation/Changes
MAINTAINERS
drivers/atm/iphase.c
drivers/net/bcm63xx_enet.c
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_ipv6.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c
drivers/net/can/Kconfig
drivers/net/can/at91_can.c
drivers/net/can/bfin_can.c
drivers/net/can/mcp251x.c
drivers/net/can/mscan/mscan.c
drivers/net/can/sja1000/sja1000.c
drivers/net/can/ti_hecc.c
drivers/net/can/usb/ems_usb.c
drivers/net/cpmac.c
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/mlx4/sense.c
drivers/net/pcmcia/3c574_cs.c
drivers/net/pcmcia/3c589_cs.c
drivers/net/sfc/selftest.c
drivers/net/sh_eth.c
drivers/net/sky2.c
drivers/net/usb/rtl8150.c
include/linux/can/dev.h
include/linux/rtnetlink.h
include/net/dst.h
include/net/ip.h
include/net/ipv6.h
include/net/netfilter/ipv6/nf_conntrack_ipv6.h
include/net/tcp.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/netfilter/nf_defrag_ipv4.c
net/ipv4/syncookies.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/reassembly.c
net/ipv6/syncookies.c
net/ipv6/tcp_ipv6.c
net/netfilter/ipvs/ip_vs_core.c
net/netfilter/ipvs/ip_vs_ctl.c
net/packet/af_packet.c

index 6d0f1efc5bf60220e97277aa381df6ecec2971bb..f08b313cd235fa6728f7780f3b4812eae543f971 100644 (file)
@@ -49,6 +49,8 @@ o  oprofile               0.9                     # oprofiled --version
 o  udev                   081                     # udevinfo -V
 o  grub                   0.93                    # grub --version
 o  mcelog                0.6
+o  iptables               1.4.1                   # iptables -V
+
 
 Kernel compilation
 ==================
index 0a32c3ec6b1cb9baf0cd6a5de82c4bf98a912489..d6a27110a7478e9bf74a7d075bd2c510d6e28986 100644 (file)
@@ -5991,9 +5991,9 @@ F:        sound/soc/codecs/wm8350.*
 F:     sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
-M:     Henner Eisen <eis@baty.hanse.de>
+M:     Andrew Hendry <andrew.hendry@gmail.com>
 L:     linux-x25@vger.kernel.org
-S:     Maintained
+S:     Odd Fixes
 F:     Documentation/networking/x25*
 F:     include/net/x25*
 F:     net/x25/
index f734b345ac71258b59ab1369b088ffe3e68cceb0..25a4c86f839b29a5436f1de6cf2829c543296435 100644 (file)
@@ -557,7 +557,7 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {
           memcpy((caddr_t)&cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));
        } /* while */
        // Move this VCI number into this location of the CBR Sched table.
-       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex,sizeof(TstSchedTbl));
+       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex, sizeof(*TstSchedTbl));
        dev->CbrRemEntries--;
        toBeAssigned--;
    } /* while */ 
index 1f6c5486d71593e1f3f1428a5e0dcc46a8a75e0a..0bd47d32ec425c531fac9468eaf297531e2140cc 100644 (file)
@@ -1245,9 +1245,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
        drvinfo->n_stats = BCM_ENET_STATS_LEN;
 }
 
-static int bcm_enet_get_stats_count(struct net_device *netdev)
+static int bcm_enet_get_sset_count(struct net_device *netdev,
+                                       int string_set)
 {
-       return BCM_ENET_STATS_LEN;
+       switch (string_set) {
+       case ETH_SS_STATS:
+               return BCM_ENET_STATS_LEN;
+       default:
+               return -EINVAL;
+       }
 }
 
 static void bcm_enet_get_strings(struct net_device *netdev,
@@ -1473,7 +1479,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,
 
 static struct ethtool_ops bcm_enet_ethtool_ops = {
        .get_strings            = bcm_enet_get_strings,
-       .get_stats_count        = bcm_enet_get_stats_count,
+       .get_sset_count         = bcm_enet_get_sset_count,
        .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
        .get_settings           = bcm_enet_get_settings,
        .set_settings           = bcm_enet_set_settings,
index d69e6838f21ee4e9931e99d7c908ad43eae51bc4..0fb7a4964e7560c93d2a44fbd85d925646690099 100644 (file)
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
@@ -352,7 +354,8 @@ static u16 __get_link_speed(struct port *port)
                }
        }
 
-       pr_debug("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
+       pr_debug("Port %d Received link speed %d update from adapter\n",
+                port->actor_port_number, speed);
        return speed;
 }
 
@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port)
                switch (slave->duplex) {
                case DUPLEX_FULL:
                        retval=0x1;
-                       pr_debug("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
+                       pr_debug("Port %d Received status full duplex update from adapter\n",
+                                port->actor_port_number);
                        break;
                case DUPLEX_HALF:
                default:
                        retval=0x0;
-                       pr_debug("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
+                       pr_debug("Port %d Received status NOT full duplex update from adapter\n",
+                                port->actor_port_number);
                        break;
                }
        }
@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)
 
        // check if the state machine was changed
        if (port->sm_mux_state != last_state) {
-               pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
+               pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                        port->actor_port_number, last_state,
+                        port->sm_mux_state);
                switch (port->sm_mux_state) {
                case AD_MUX_DETACHED:
                        __detach_bond_from_agg(port);
@@ -1079,7 +1086,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 
        // check if the State machine was changed or new lacpdu arrived
        if ((port->sm_rx_state != last_state) || (lacpdu)) {
-               pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
+               pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                        port->actor_port_number, last_state,
+                        port->sm_rx_state);
                switch (port->sm_rx_state) {
                case AD_RX_INITIALIZE:
                        if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
@@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                        // detect loopback situation
                        if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                // INFO_RECEIVED_LOOPBACK_FRAMES
-                               pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
-                                      "adapter (%s). Check the configuration to verify that all "
-                                      "Adapters are connected to 802.3ad compliant switch ports\n",
+                               pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
+                                      "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
                                       port->slave->dev->master->name, port->slave->dev->name);
                                __release_rx_machine_lock(port);
                                return;
@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
                        __update_lacpdu_from_port(port);
 
                        if (ad_lacpdu_send(port) >= 0) {
-                               pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
+                               pr_debug("Sent LACPDU on port %d\n",
+                                        port->actor_port_number);
 
                                /* mark ntt as false, so it will not be sent again until
                                   demanded */
@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)
 
        // check if the state machine was changed
        if (port->sm_periodic_state != last_state) {
-               pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
+               pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                        port->actor_port_number, last_state,
+                        port->sm_periodic_state);
                switch (port->sm_periodic_state) {
                case AD_NO_PERIODIC:
                        port->sm_periodic_timer_counter = 0;       // zero timer
@@ -1298,7 +1309,9 @@ static void ad_port_selection_logic(struct port *port)
                                port->next_port_in_aggregator=NULL;
                                port->actor_port_aggregator_identifier=0;
 
-                               pr_debug("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
+                               pr_debug("Port %d left LAG %d\n",
+                                        port->actor_port_number,
+                                        temp_aggregator->aggregator_identifier);
                                // if the aggregator is empty, clear its parameters, and set it ready to be attached
                                if (!temp_aggregator->lag_ports) {
                                        ad_clear_agg(temp_aggregator);
@@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port)
                        }
                }
                if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                       pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
-                                  "was related to aggregator %d but was not "
-                                  "on its port list\n",
+                       pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
                                   port->slave->dev->master->name,
                                   port->actor_port_number,
                                   port->slave->dev->name,
@@ -1343,7 +1354,9 @@ static void ad_port_selection_logic(struct port *port)
                        port->next_port_in_aggregator=aggregator->lag_ports;
                        port->aggregator->num_of_ports++;
                        aggregator->lag_ports=port;
-                       pr_debug("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                       pr_debug("Port %d joined LAG %d(existing LAG)\n",
+                                port->actor_port_number,
+                                port->aggregator->aggregator_identifier);
 
                        // mark this port as selected
                        port->sm_vars |= AD_PORT_SELECTED;
@@ -1380,10 +1393,11 @@ static void ad_port_selection_logic(struct port *port)
                        // mark this port as selected
                        port->sm_vars |= AD_PORT_SELECTED;
 
-                       pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                       pr_debug("Port %d joined LAG %d(new LAG)\n",
+                                port->actor_port_number,
+                                port->aggregator->aggregator_identifier);
                } else {
-                       pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
-                              "a suitable aggregator\n",
+                       pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
                               port->slave->dev->master->name,
                               port->actor_port_number, port->slave->dev->name);
                }
@@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                break;
 
        default:
-               pr_warning(DRV_NAME
-                          ": %s: Impossible agg select mode %d\n",
+               pr_warning("%s: Impossible agg select mode %d\n",
                           curr->slave->dev->master->name,
                           __get_agg_selection_mode(curr->lag_ports));
                break;
@@ -1546,40 +1559,38 @@ static void ad_agg_selection_logic(struct aggregator *agg)
        // if there is new best aggregator, activate it
        if (best) {
                pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                      best->aggregator_identifier, best->num_of_ports,
-                      best->actor_oper_aggregator_key,
-                      best->partner_oper_aggregator_key,
-                      best->is_individual, best->is_active);
+                        best->aggregator_identifier, best->num_of_ports,
+                        best->actor_oper_aggregator_key,
+                        best->partner_oper_aggregator_key,
+                        best->is_individual, best->is_active);
                pr_debug("best ports %p slave %p %s\n",
-                      best->lag_ports, best->slave,
-                      best->slave ? best->slave->dev->name : "NULL");
+                        best->lag_ports, best->slave,
+                        best->slave ? best->slave->dev->name : "NULL");
 
                for (agg = __get_first_agg(best->lag_ports); agg;
                     agg = __get_next_agg(agg)) {
 
                        pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                               agg->aggregator_identifier, agg->num_of_ports,
-                               agg->actor_oper_aggregator_key,
-                               agg->partner_oper_aggregator_key,
-                               agg->is_individual, agg->is_active);
+                                agg->aggregator_identifier, agg->num_of_ports,
+                                agg->actor_oper_aggregator_key,
+                                agg->partner_oper_aggregator_key,
+                                agg->is_individual, agg->is_active);
                }
 
                // check if any partner replys
                if (best->is_individual) {
-                       pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"
-                              " response from the link partner for any"
-                              " adapters in the bond\n",
-                              best->slave->dev->master->name);
+                       pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
+                                  best->slave->dev->master->name);
                }
 
                best->is_active = 1;
                pr_debug("LAG %d chosen as the active LAG\n",
-                       best->aggregator_identifier);
+                        best->aggregator_identifier);
                pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                       best->aggregator_identifier, best->num_of_ports,
-                       best->actor_oper_aggregator_key,
-                       best->partner_oper_aggregator_key,
-                       best->is_individual, best->is_active);
+                        best->aggregator_identifier, best->num_of_ports,
+                        best->actor_oper_aggregator_key,
+                        best->partner_oper_aggregator_key,
+                        best->is_individual, best->is_active);
 
                // disable the ports that were related to the former active_aggregator
                if (active) {
@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
                aggregator->lag_ports = NULL;
                aggregator->is_active = 0;
                aggregator->num_of_ports = 0;
-               pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
+               pr_debug("LAG %d was cleared\n",
+                        aggregator->aggregator_identifier);
        }
 }
 
@@ -1728,7 +1740,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
 static void ad_enable_collecting_distributing(struct port *port)
 {
        if (port->aggregator->is_active) {
-               pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+               pr_debug("Enabling port %d(LAG %d)\n",
+                        port->actor_port_number,
+                        port->aggregator->aggregator_identifier);
                __enable_port(port);
        }
 }
@@ -1741,7 +1755,9 @@ static void ad_enable_collecting_distributing(struct port *port)
 static void ad_disable_collecting_distributing(struct port *port)
 {
        if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
-               pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+               pr_debug("Disabling port %d(LAG %d)\n",
+                        port->actor_port_number,
+                        port->aggregator->aggregator_identifier);
                __disable_port(port);
        }
 }
@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)
 
        // send the marker information
        if (ad_marker_send(port, &marker) >= 0) {
-               pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
+               pr_debug("Sent Marker Information on port %d\n",
+                        port->actor_port_number);
        }
 }
 #endif
@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
        // send the marker response
 
        if (ad_marker_send(port, &marker) >= 0) {
-               pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
+               pr_debug("Sent Marker Response on port %d\n",
+                        port->actor_port_number);
        }
 }
 
@@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave)
        struct aggregator *aggregator;
 
        if (bond == NULL) {
-               pr_err(DRV_NAME ": %s: The slave %s is not attached to "
-                      "its bond\n",
+               pr_err("%s: The slave %s is not attached to its bond\n",
                       slave->dev->master->name, slave->dev->name);
                return -1;
        }
@@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               pr_warning(DRV_NAME ": Warning: %s: Trying to "
-                          "unbind an uninitialized port on %s\n",
+               pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
                           slave->dev->master->name, slave->dev->name);
                return;
        }
 
-       pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
+       pr_debug("Unbinding Link Aggregation Group %d\n",
+                aggregator->aggregator_identifier);
 
        /* Tell the partner that this port is not suitable for aggregation */
        port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
@@ -1996,10 +2013,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
                        // if new aggregator found, copy the aggregator's parameters
                        // and connect the related lag_ports to the new aggregator
                        if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
-                               pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
+                               pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n",
+                                        aggregator->aggregator_identifier,
+                                        new_aggregator->aggregator_identifier);
 
                                if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                       pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                       pr_info("%s: Removing an active aggregator\n",
                                                aggregator->slave->dev->master->name);
                                        // select new active aggregator
                                         select_new_active_agg = 1;
@@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                        ad_agg_selection_logic(__get_first_agg(port));
                                }
                        } else {
-                               pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
-                                          "and could not find a new aggregator for its ports\n",
+                               pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
                                           slave->dev->master->name);
                        }
                } else { // in case that the only port related to this aggregator is the one we want to remove
@@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                        // clear the aggregator
                        ad_clear_agg(aggregator);
                        if (select_new_active_agg) {
-                               pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                               pr_info("%s: Removing an active aggregator\n",
                                        slave->dev->master->name);
                                // select new active aggregator
                                ad_agg_selection_logic(__get_first_agg(port));
@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                        // clear the aggregator
                                        ad_clear_agg(temp_aggregator);
                                        if (select_new_active_agg) {
-                                               pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                               pr_info("%s: Removing an active aggregator\n",
                                                        slave->dev->master->name);
                                                // select new active aggregator
                                                ad_agg_selection_logic(__get_first_agg(port));
@@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                // select the active aggregator for the bond
                if ((port = __get_first_port(bond))) {
                        if (!port->slave) {
-                               pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
-                                          "uninitialized\n", bond->dev->name);
+                               pr_warning("%s: Warning: bond's first port is uninitialized\n",
+                                          bond->dev->name);
                                goto re_arm;
                        }
 
@@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
        // for each port run the state machines
        for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                if (!port->slave) {
-                       pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
-                                  "port\n", bond->dev->name);
+                       pr_warning("%s: Warning: Found an uninitialized port\n",
+                                  bond->dev->name);
                        goto re_arm;
                }
 
@@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                port = &(SLAVE_AD_INFO(slave).port);
 
                if (!port->slave) {
-                       pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
-                                  "is uninitialized\n",
+                       pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                   slave->dev->name, slave->dev->master->name);
                        return;
                }
 
                switch (lacpdu->subtype) {
                case AD_TYPE_LACPDU:
-                       pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
+                       pr_debug("Received LACPDU on port %d\n",
+                                port->actor_port_number);
                        ad_rx_machine(lacpdu, port);
                        break;
 
@@ -2188,17 +2206,20 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
 
                        switch (((struct bond_marker *)lacpdu)->tlv_type) {
                        case AD_MARKER_INFORMATION_SUBTYPE:
-                               pr_debug("Received Marker Information on port %d\n", port->actor_port_number);
+                               pr_debug("Received Marker Information on port %d\n",
+                                        port->actor_port_number);
                                ad_marker_info_received((struct bond_marker *)lacpdu, port);
                                break;
 
                        case AD_MARKER_RESPONSE_SUBTYPE:
-                               pr_debug("Received Marker Response on port %d\n", port->actor_port_number);
+                               pr_debug("Received Marker Response on port %d\n",
+                                        port->actor_port_number);
                                ad_marker_response_received((struct bond_marker *)lacpdu, port);
                                break;
 
                        default:
-                               pr_debug("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
+                               pr_debug("Received an unknown Marker subtype on slot %d\n",
+                                        port->actor_port_number);
                        }
                }
        }
@@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               pr_warning(DRV_NAME ": Warning: %s: speed "
-                          "changed for uninitialized port on %s\n",
+               pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
                           slave->dev->master->name, slave->dev->name);
                return;
        }
@@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               pr_warning(DRV_NAME ": %s: Warning: duplex changed "
-                          "for uninitialized port on %s\n",
+               pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
                           slave->dev->master->name, slave->dev->name);
                return;
        }
@@ -2275,8 +2294,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               pr_warning(DRV_NAME ": Warning: %s: link status changed for "
-                          "uninitialized port on %s\n",
+               pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
                           slave->dev->master->name, slave->dev->name);
                return;
        }
@@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
        }
 
        if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-               pr_debug(DRV_NAME ": %s: Error: "
-                        "bond_3ad_get_active_agg_info failed\n", dev->name);
+               pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
+                        dev->name);
                goto out;
        }
 
@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
        if (slaves_in_agg == 0) {
                /*the aggregator is empty*/
-               pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
-                        dev->name);
+               pr_debug("%s: Error: active aggregator is empty\n", dev->name);
                goto out;
        }
 
@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
        }
 
        if (slave_agg_no >= 0) {
-               pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
-                      "for aggregator ID %d\n", dev->name, agg_id);
+               pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
+                      dev->name, agg_id);
                goto out;
        }
 
index 00ab51ef3129c835523bc2aefebbb076f7a89aa9..40fdc41446cc130f1363e9d4a17a9d3203b3166b 100644 (file)
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)
 
        new_hashtbl = kzalloc(size, GFP_KERNEL);
        if (!new_hashtbl) {
-               pr_err(DRV_NAME
-                      ": %s: Error: Failed to allocate TLB hash table\n",
+               pr_err("%s: Error: Failed to allocate TLB hash table\n",
                       bond->dev->name);
                return -1;
        }
@@ -514,8 +515,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                 client_info->slave->dev->dev_addr,
                                 client_info->mac_dst);
                if (!skb) {
-                       pr_err(DRV_NAME
-                              ": %s: Error: failed to create an ARP packet\n",
+                       pr_err("%s: Error: failed to create an ARP packet\n",
                               client_info->slave->dev->master->name);
                        continue;
                }
@@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                if (client_info->tag) {
                        skb = vlan_put_tag(skb, client_info->vlan_id);
                        if (!skb) {
-                               pr_err(DRV_NAME
-                                      ": %s: Error: failed to insert VLAN tag\n",
+                               pr_err("%s: Error: failed to insert VLAN tag\n",
                                       client_info->slave->dev->master->name);
                                continue;
                        }
@@ -609,9 +608,7 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                if (!client_info->slave) {
-                       pr_err(DRV_NAME
-                              ": %s: Error: found a client with no channel in "
-                              "the client's hash table\n",
+                       pr_err("%s: Error: found a client with no channel in the client's hash table\n",
                               bond->dev->name);
                        continue;
                }
@@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)
 
        new_hashtbl = kmalloc(size, GFP_KERNEL);
        if (!new_hashtbl) {
-               pr_err(DRV_NAME
-                      ": %s: Error: Failed to allocate RLB hash table\n",
+               pr_err("%s: Error: Failed to allocate RLB hash table\n",
                       bond->dev->name);
                return -1;
        }
@@ -928,8 +924,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 
                        skb = vlan_put_tag(skb, vlan->vlan_id);
                        if (!skb) {
-                               pr_err(DRV_NAME
-                                      ": %s: Error: failed to insert VLAN tag\n",
+                               pr_err("%s: Error: failed to insert VLAN tag\n",
                                       bond->dev->name);
                                continue;
                        }
@@ -958,11 +953,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
        memcpy(s_addr.sa_data, addr, dev->addr_len);
        s_addr.sa_family = dev->type;
        if (dev_set_mac_address(dev, &s_addr)) {
-               pr_err(DRV_NAME
-                      ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
-                      "mode requires that the base driver support setting "
-                      "the hw address also when the network device's "
-                      "interface is open\n",
+               pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
+                      "ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
                       dev->master->name, dev->name);
                return -EOPNOTSUPP;
        }
@@ -1169,18 +1161,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
                                       bond->alb_info.rlb_enabled);
 
-               pr_warning(DRV_NAME
-                          ": %s: Warning: the hw address of slave %s is "
-                          "in use by the bond; giving it the hw address "
-                          "of %s\n",
+               pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
                           bond->dev->name, slave->dev->name,
                           free_mac_slave->dev->name);
 
        } else if (has_bond_addr) {
-               pr_err(DRV_NAME
-                      ": %s: Error: the hw address of slave %s is in use by the "
-                      "bond; couldn't find a slave with a free hw address to "
-                      "give it (this should not have happened)\n",
+               pr_err("%s: Error: the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
                       bond->dev->name, slave->dev->name);
                return -EFAULT;
        }
index b72e1dc8cf8fc9cf7722e093ad51900bdfc253db..6dd64cf3cb76889d3f5be1ffdd0db84d6b395196 100644 (file)
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/if_vlan.h>
 #include <net/ipv6.h>
@@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev,
        addrconf_addr_solict_mult(daddr, &mcaddr);
 
        pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
-              slave_dev->name, &mcaddr, daddr);
+                slave_dev->name, &mcaddr, daddr);
 
        skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
                              ND_OPT_TARGET_LL_ADDR);
 
        if (!skb) {
-               pr_err(DRV_NAME ": NA packet allocation failed\n");
+               pr_err("NA packet allocation failed\n");
                return;
        }
 
        if (vlan_id) {
                skb = vlan_put_tag(skb, vlan_id);
                if (!skb) {
-                       pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                       pr_err("failed to insert VLAN tag\n");
                        return;
                }
        }
@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
        struct inet6_dev *idev;
        int is_router;
 
-       pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
-                               slave ? slave->dev->name : "NULL");
+       pr_debug("%s: bond %s slave %s\n", bond->dev->name,
+                __func__, slave ? slave->dev->name : "NULL");
 
        if (!slave || !bond->send_unsol_na ||
            test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
index af9b9c4eb496eb5d6200cca8bbf57cee36f23b10..3f0071cfe56b3a06c6f53e4ca29503393a4c5d94 100644 (file)
@@ -31,6 +31,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -260,7 +262,7 @@ static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id)
        struct vlan_entry *vlan;
 
        pr_debug("bond: %s, vlan id %d\n",
-               (bond ? bond->dev->name : "None"), vlan_id);
+                (bond ? bond->dev->name : "None"), vlan_id);
 
        vlan = kzalloc(sizeof(struct vlan_entry), GFP_KERNEL);
        if (!vlan)
@@ -303,8 +305,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                        if (bond_is_lb(bond))
                                bond_alb_clear_vlan(bond, vlan_id);
 
-                       pr_debug("removed VLAN ID %d from bond %s\n", vlan_id,
-                               bond->dev->name);
+                       pr_debug("removed VLAN ID %d from bond %s\n",
+                                vlan_id, bond->dev->name);
 
                        kfree(vlan);
 
@@ -323,8 +325,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                }
        }
 
-       pr_debug("couldn't find VLAN ID %d in bond %s\n", vlan_id,
-               bond->dev->name);
+       pr_debug("couldn't find VLAN ID %d in bond %s\n",
+                vlan_id, bond->dev->name);
 
 out:
        write_unlock_bh(&bond->lock);
@@ -348,7 +350,7 @@ static int bond_has_challenged_slaves(struct bonding *bond)
        bond_for_each_slave(bond, slave, i) {
                if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) {
                        pr_debug("found VLAN challenged slave - %s\n",
-                               slave->dev->name);
+                                slave->dev->name);
                        return 1;
                }
        }
@@ -499,8 +501,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
 
        res = bond_add_vlan(bond, vid);
        if (res) {
-               pr_err(DRV_NAME
-                      ": %s: Error: Failed to add vlan id %d\n",
+               pr_err("%s: Error: Failed to add vlan id %d\n",
                       bond_dev->name, vid);
        }
 }
@@ -534,8 +535,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
 
        res = bond_del_vlan(bond, vid);
        if (res) {
-               pr_err(DRV_NAME
-                      ": %s: Error: Failed to remove vlan id %d\n",
+               pr_err("%s: Error: Failed to remove vlan id %d\n",
                       bond_dev->name, vid);
        }
 }
@@ -1053,8 +1053,7 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                rv = dev_set_mac_address(new_active->dev, &saddr);
                if (rv) {
-                       pr_err(DRV_NAME
-                              ": %s: Error %d setting MAC of slave %s\n",
+                       pr_err("%s: Error %d setting MAC of slave %s\n",
                               bond->dev->name, -rv, new_active->dev->name);
                        goto out;
                }
@@ -1067,16 +1066,14 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                rv = dev_set_mac_address(old_active->dev, &saddr);
                if (rv)
-                       pr_err(DRV_NAME
-                              ": %s: Error %d setting MAC of slave %s\n",
+                       pr_err("%s: Error %d setting MAC of slave %s\n",
                               bond->dev->name, -rv, new_active->dev->name);
 out:
                read_lock(&bond->lock);
                write_lock_bh(&bond->curr_slave_lock);
                break;
        default:
-               pr_err(DRV_NAME
-                      ": %s: bond_do_fail_over_mac impossible: bad policy %d\n",
+               pr_err("%s: bond_do_fail_over_mac impossible: bad policy %d\n",
                       bond->dev->name, bond->params.fail_over_mac);
                break;
        }
@@ -1178,11 +1175,9 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 
                if (new_active->link == BOND_LINK_BACK) {
                        if (USES_PRIMARY(bond->params.mode)) {
-                               pr_info(DRV_NAME
-                                      ": %s: making interface %s the new "
-                                      "active one %d ms earlier.\n",
-                                      bond->dev->name, new_active->dev->name,
-                                      (bond->params.updelay - new_active->delay) * bond->params.miimon);
+                               pr_info("%s: making interface %s the new active one %d ms earlier.\n",
+                                       bond->dev->name, new_active->dev->name,
+                                       (bond->params.updelay - new_active->delay) * bond->params.miimon);
                        }
 
                        new_active->delay = 0;
@@ -1195,10 +1190,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
                                bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
                } else {
                        if (USES_PRIMARY(bond->params.mode)) {
-                               pr_info(DRV_NAME
-                                      ": %s: making interface %s the new "
-                                      "active one.\n",
-                                      bond->dev->name, new_active->dev->name);
+                               pr_info("%s: making interface %s the new active one.\n",
+                                       bond->dev->name, new_active->dev->name);
                        }
                }
        }
@@ -1268,13 +1261,11 @@ void bond_select_active_slave(struct bonding *bond)
                        return;
 
                if (netif_carrier_ok(bond->dev)) {
-                       pr_info(DRV_NAME
-                              ": %s: first active interface up!\n",
-                              bond->dev->name);
+                       pr_info("%s: first active interface up!\n",
+                               bond->dev->name);
                } else {
-                       pr_info(DRV_NAME ": %s: "
-                              "now running without any active interface !\n",
-                              bond->dev->name);
+                       pr_info("%s: now running without any active interface !\n",
+                               bond->dev->name);
                }
        }
 }
@@ -1423,16 +1414,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
        if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
                slave_ops->ndo_do_ioctl == NULL) {
-               pr_warning(DRV_NAME
-                      ": %s: Warning: no link monitoring support for %s\n",
-                      bond_dev->name, slave_dev->name);
+               pr_warning("%s: Warning: no link monitoring support for %s\n",
+                          bond_dev->name, slave_dev->name);
        }
 
        /* bond must be initialized by bond_open() before enslaving */
        if (!(bond_dev->flags & IFF_UP)) {
-               pr_warning(DRV_NAME
-                       " %s: master_dev is not up in bond_enslave\n",
-                       bond_dev->name);
+               pr_warning("%s: master_dev is not up in bond_enslave\n",
+                          bond_dev->name);
        }
 
        /* already enslaved */
@@ -1446,19 +1435,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
                pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
                if (!list_empty(&bond->vlan_list)) {
-                       pr_err(DRV_NAME
-                              ": %s: Error: cannot enslave VLAN "
-                              "challenged slave %s on VLAN enabled "
-                              "bond %s\n", bond_dev->name, slave_dev->name,
-                              bond_dev->name);
+                       pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",
+                              bond_dev->name, slave_dev->name, bond_dev->name);
                        return -EPERM;
                } else {
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: enslaved VLAN challenged "
-                              "slave %s. Adding VLANs will be blocked as "
-                              "long as %s is part of bond %s\n",
-                              bond_dev->name, slave_dev->name, slave_dev->name,
-                              bond_dev->name);
+                       pr_warning("%s: Warning: enslaved VLAN challenged slave %s. Adding VLANs will be blocked as long as %s is part of bond %s\n",
+                                  bond_dev->name, slave_dev->name,
+                                  slave_dev->name, bond_dev->name);
                        bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                }
        } else {
@@ -1478,8 +1461,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         * enslaving it; the old ifenslave will not.
         */
        if ((slave_dev->flags & IFF_UP)) {
-               pr_err(DRV_NAME ": %s is up. "
-                      "This may be due to an out of date ifenslave.\n",
+               pr_err("%s is up. This may be due to an out of date ifenslave.\n",
                       slave_dev->name);
                res = -EPERM;
                goto err_undo_flags;
@@ -1495,7 +1477,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        if (bond->slave_cnt == 0) {
                if (bond_dev->type != slave_dev->type) {
                        pr_debug("%s: change device type from %d to %d\n",
-                               bond_dev->name, bond_dev->type, slave_dev->type);
+                                bond_dev->name,
+                                bond_dev->type, slave_dev->type);
 
                        netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE);
 
@@ -1507,28 +1490,21 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                        netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE);
                }
        } else if (bond_dev->type != slave_dev->type) {
-               pr_err(DRV_NAME ": %s ether type (%d) is different "
-                       "from other slaves (%d), can not enslave it.\n",
-                       slave_dev->name,
-                       slave_dev->type, bond_dev->type);
-                       res = -EINVAL;
-                       goto err_undo_flags;
+               pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n",
+                      slave_dev->name,
+                      slave_dev->type, bond_dev->type);
+               res = -EINVAL;
+               goto err_undo_flags;
        }
 
        if (slave_ops->ndo_set_mac_address == NULL) {
                if (bond->slave_cnt == 0) {
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: The first slave device "
-                              "specified does not support setting the MAC "
-                              "address. Setting fail_over_mac to active.",
-                              bond_dev->name);
+                       pr_warning("%s: Warning: The first slave device specified does not support setting the MAC address. Setting fail_over_mac to active.",
+                                  bond_dev->name);
                        bond->params.fail_over_mac = BOND_FOM_ACTIVE;
                } else if (bond->params.fail_over_mac != BOND_FOM_ACTIVE) {
-                       pr_err(DRV_NAME
-                               ": %s: Error: The slave device specified "
-                               "does not support setting the MAC address, "
-                               "but fail_over_mac is not set to active.\n"
-                               , bond_dev->name);
+                       pr_err("%s: Error: The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active.\n",
+                              bond_dev->name);
                        res = -EOPNOTSUPP;
                        goto err_undo_flags;
                }
@@ -1655,22 +1631,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         * supported); thus, we don't need to change
                         * the messages for netif_carrier.
                         */
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: MII and ETHTOOL support not "
-                              "available for interface %s, and "
-                              "arp_interval/arp_ip_target module parameters "
-                              "not specified, thus bonding will not detect "
-                              "link failures! see bonding.txt for details.\n",
+                       pr_warning("%s: Warning: MII and ETHTOOL support not available for interface %s, and arp_interval/arp_ip_target module parameters not specified, thus bonding will not detect link failures! see bonding.txt for details.\n",
                               bond_dev->name, slave_dev->name);
                } else if (link_reporting == -1) {
                        /* unable get link status using mii/ethtool */
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: can't get link status from "
-                              "interface %s; the network driver associated "
-                              "with this interface does not support MII or "
-                              "ETHTOOL link status reporting, thus miimon "
-                              "has no effect on this interface.\n",
-                              bond_dev->name, slave_dev->name);
+                       pr_warning("%s: Warning: can't get link status from interface %s; the network driver associated with this interface does not support MII or ETHTOOL link status reporting, thus miimon has no effect on this interface.\n",
+                                  bond_dev->name, slave_dev->name);
                }
        }
 
@@ -1678,34 +1644,27 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        if (!bond->params.miimon ||
            (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
                if (bond->params.updelay) {
-                       pr_debug("Initial state of slave_dev is "
-                               "BOND_LINK_BACK\n");
+                       pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
                        new_slave->link  = BOND_LINK_BACK;
                        new_slave->delay = bond->params.updelay;
                } else {
-                       pr_debug("Initial state of slave_dev is "
-                               "BOND_LINK_UP\n");
+                       pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
                        new_slave->link  = BOND_LINK_UP;
                }
                new_slave->jiffies = jiffies;
        } else {
-               pr_debug("Initial state of slave_dev is "
-                       "BOND_LINK_DOWN\n");
+               pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
                new_slave->link  = BOND_LINK_DOWN;
        }
 
        if (bond_update_speed_duplex(new_slave) &&
            (new_slave->link != BOND_LINK_DOWN)) {
-               pr_warning(DRV_NAME
-                      ": %s: Warning: failed to get speed and duplex from %s, "
-                      "assumed to be 100Mb/sec and Full.\n",
-                      bond_dev->name, new_slave->dev->name);
+               pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
+                          bond_dev->name, new_slave->dev->name);
 
                if (bond->params.mode == BOND_MODE_8023AD) {
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
-                              "support in base driver for proper aggregator "
-                              "selection.\n", bond_dev->name);
+                       pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
+                                  bond_dev->name);
                }
        }
 
@@ -1777,11 +1736,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        if (res)
                goto err_close;
 
-       pr_info(DRV_NAME
-              ": %s: enslaving %s as a%s interface with a%s link.\n",
-              bond_dev->name, slave_dev->name,
-              new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
-              new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
+       pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
+               bond_dev->name, slave_dev->name,
+               new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+               new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 
        /* enslave is successful */
        return 0;
@@ -1833,8 +1791,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        /* slave is not a slave or master is not master of this slave */
        if (!(slave_dev->flags & IFF_SLAVE) ||
            (slave_dev->master != bond_dev)) {
-               pr_err(DRV_NAME
-                      ": %s: Error: cannot release %s.\n",
+               pr_err("%s: Error: cannot release %s.\n",
                       bond_dev->name, slave_dev->name);
                return -EINVAL;
        }
@@ -1844,9 +1801,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        slave = bond_get_slave_by_dev(bond, slave_dev);
        if (!slave) {
                /* not a slave of this bond */
-               pr_info(DRV_NAME
-                      ": %s: %s not enslaved\n",
-                      bond_dev->name, slave_dev->name);
+               pr_info("%s: %s not enslaved\n",
+                       bond_dev->name, slave_dev->name);
                write_unlock_bh(&bond->lock);
                return -EINVAL;
        }
@@ -1854,14 +1810,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        if (!bond->params.fail_over_mac) {
                if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
                    bond->slave_cnt > 1)
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: the permanent HWaddr of %s - "
-                              "%pM - is still in use by %s. "
-                              "Set the HWaddr of %s to a different address "
-                              "to avoid conflicts.\n",
-                              bond_dev->name, slave_dev->name,
-                              slave->perm_hwaddr,
-                              bond_dev->name, slave_dev->name);
+                       pr_warning("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",
+                                  bond_dev->name, slave_dev->name,
+                                  slave->perm_hwaddr,
+                                  bond_dev->name, slave_dev->name);
        }
 
        /* Inform AD package of unbinding of slave. */
@@ -1872,12 +1824,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                bond_3ad_unbind_slave(slave);
        }
 
-       pr_info(DRV_NAME
-              ": %s: releasing %s interface %s\n",
-              bond_dev->name,
-              (slave->state == BOND_STATE_ACTIVE)
-              ? "active" : "backup",
-              slave_dev->name);
+       pr_info("%s: releasing %s interface %s\n",
+               bond_dev->name,
+               (slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+               slave_dev->name);
 
        oldcurrent = bond->curr_active_slave;
 
@@ -1934,21 +1884,15 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                if (list_empty(&bond->vlan_list)) {
                        bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                } else {
-                       pr_warning(DRV_NAME
-                              ": %s: Warning: clearing HW address of %s while it "
-                              "still has VLANs.\n",
-                              bond_dev->name, bond_dev->name);
-                       pr_warning(DRV_NAME
-                              ": %s: When re-adding slaves, make sure the bond's "
-                              "HW address matches its VLANs'.\n",
-                              bond_dev->name);
+                       pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                                  bond_dev->name, bond_dev->name);
+                       pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                                  bond_dev->name);
                }
        } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
                   !bond_has_challenged_slaves(bond)) {
-               pr_info(DRV_NAME
-                      ": %s: last VLAN challenged slave %s "
-                      "left bond %s. VLAN blocking is removed\n",
-                      bond_dev->name, slave_dev->name, bond_dev->name);
+               pr_info("%s: last VLAN challenged slave %s left bond %s. VLAN blocking is removed\n",
+                       bond_dev->name, slave_dev->name, bond_dev->name);
                bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
        }
 
@@ -2011,8 +1955,8 @@ int  bond_release_and_destroy(struct net_device *bond_dev,
 
        ret = bond_release(bond_dev, slave_dev);
        if ((ret == 0) && (bond->slave_cnt == 0)) {
-               pr_info(DRV_NAME ": %s: destroying bond %s.\n",
-                      bond_dev->name, bond_dev->name);
+               pr_info("%s: destroying bond %s.\n",
+                       bond_dev->name, bond_dev->name);
                unregister_netdevice(bond_dev);
        }
        return ret;
@@ -2116,19 +2060,13 @@ static int bond_release_all(struct net_device *bond_dev)
        if (list_empty(&bond->vlan_list))
                bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
        else {
-               pr_warning(DRV_NAME
-                      ": %s: Warning: clearing HW address of %s while it "
-                      "still has VLANs.\n",
-                      bond_dev->name, bond_dev->name);
-               pr_warning(DRV_NAME
-                      ": %s: When re-adding slaves, make sure the bond's "
-                      "HW address matches its VLANs'.\n",
-                      bond_dev->name);
+               pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                          bond_dev->name, bond_dev->name);
+               pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                          bond_dev->name);
        }
 
-       pr_info(DRV_NAME
-              ": %s: released all slaves\n",
-              bond_dev->name);
+       pr_info("%s: released all slaves\n", bond_dev->name);
 
 out:
        write_unlock_bh(&bond->lock);
@@ -2254,16 +2192,14 @@ static int bond_miimon_inspect(struct bonding *bond)
                        slave->link = BOND_LINK_FAIL;
                        slave->delay = bond->params.downdelay;
                        if (slave->delay) {
-                               pr_info(DRV_NAME
-                                      ": %s: link status down for %s"
-                                      "interface %s, disabling it in %d ms.\n",
-                                      bond->dev->name,
-                                      (bond->params.mode ==
-                                       BOND_MODE_ACTIVEBACKUP) ?
-                                      ((slave->state == BOND_STATE_ACTIVE) ?
-                                       "active " : "backup ") : "",
-                                      slave->dev->name,
-                                      bond->params.downdelay * bond->params.miimon);
+                               pr_info("%s: link status down for %sinterface %s, disabling it in %d ms.\n",
+                                       bond->dev->name,
+                                       (bond->params.mode ==
+                                        BOND_MODE_ACTIVEBACKUP) ?
+                                       ((slave->state == BOND_STATE_ACTIVE) ?
+                                        "active " : "backup ") : "",
+                                       slave->dev->name,
+                                       bond->params.downdelay * bond->params.miimon);
                        }
                        /*FALLTHRU*/
                case BOND_LINK_FAIL:
@@ -2273,13 +2209,11 @@ static int bond_miimon_inspect(struct bonding *bond)
                                 */
                                slave->link = BOND_LINK_UP;
                                slave->jiffies = jiffies;
-                               pr_info(DRV_NAME
-                                      ": %s: link status up again after %d "
-                                      "ms for interface %s.\n",
-                                      bond->dev->name,
-                                      (bond->params.downdelay - slave->delay) *
-                                      bond->params.miimon,
-                                      slave->dev->name);
+                               pr_info("%s: link status up again after %d ms for interface %s.\n",
+                                       bond->dev->name,
+                                       (bond->params.downdelay - slave->delay) *
+                                       bond->params.miimon,
+                                       slave->dev->name);
                                continue;
                        }
 
@@ -2300,25 +2234,21 @@ static int bond_miimon_inspect(struct bonding *bond)
                        slave->delay = bond->params.updelay;
 
                        if (slave->delay) {
-                               pr_info(DRV_NAME
-                                      ": %s: link status up for "
-                                      "interface %s, enabling it in %d ms.\n",
-                                      bond->dev->name, slave->dev->name,
-                                      ignore_updelay ? 0 :
-                                      bond->params.updelay *
-                                      bond->params.miimon);
+                               pr_info("%s: link status up for interface %s, enabling it in %d ms.\n",
+                                       bond->dev->name, slave->dev->name,
+                                       ignore_updelay ? 0 :
+                                       bond->params.updelay *
+                                       bond->params.miimon);
                        }
                        /*FALLTHRU*/
                case BOND_LINK_BACK:
                        if (!link_state) {
                                slave->link = BOND_LINK_DOWN;
-                               pr_info(DRV_NAME
-                                      ": %s: link status down again after %d "
-                                      "ms for interface %s.\n",
-                                      bond->dev->name,
-                                      (bond->params.updelay - slave->delay) *
-                                      bond->params.miimon,
-                                      slave->dev->name);
+                               pr_info("%s: link status down again after %d ms for interface %s.\n",
+                                       bond->dev->name,
+                                       (bond->params.updelay - slave->delay) *
+                                       bond->params.miimon,
+                                       slave->dev->name);
 
                                continue;
                        }
@@ -2366,10 +2296,8 @@ static void bond_miimon_commit(struct bonding *bond)
                                slave->state = BOND_STATE_BACKUP;
                        }
 
-                       pr_info(DRV_NAME
-                              ": %s: link status definitely "
-                              "up for interface %s.\n",
-                              bond->dev->name, slave->dev->name);
+                       pr_info("%s: link status definitely up for interface %s.\n",
+                               bond->dev->name, slave->dev->name);
 
                        /* notify ad that the link status has changed */
                        if (bond->params.mode == BOND_MODE_8023AD)
@@ -2395,10 +2323,8 @@ static void bond_miimon_commit(struct bonding *bond)
                            bond->params.mode == BOND_MODE_8023AD)
                                bond_set_slave_inactive_flags(slave);
 
-                       pr_info(DRV_NAME
-                              ": %s: link status definitely down for "
-                              "interface %s, disabling it\n",
-                              bond->dev->name, slave->dev->name);
+                       pr_info("%s: link status definitely down for interface %s, disabling it\n",
+                               bond->dev->name, slave->dev->name);
 
                        if (bond->params.mode == BOND_MODE_8023AD)
                                bond_3ad_handle_link_change(slave,
@@ -2414,8 +2340,7 @@ static void bond_miimon_commit(struct bonding *bond)
                        continue;
 
                default:
-                       pr_err(DRV_NAME
-                              ": %s: invalid new link %d on slave %s\n",
+                       pr_err("%s: invalid new link %d on slave %s\n",
                               bond->dev->name, slave->new_link,
                               slave->dev->name);
                        slave->new_link = BOND_LINK_NOCHANGE;
@@ -2534,19 +2459,19 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
        struct sk_buff *skb;
 
        pr_debug("arp %d on slave %s: dst %x src %x vid %d\n", arp_op,
-              slave_dev->name, dest_ip, src_ip, vlan_id);
+                slave_dev->name, dest_ip, src_ip, vlan_id);
 
        skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,
                         NULL, slave_dev->dev_addr, NULL);
 
        if (!skb) {
-               pr_err(DRV_NAME ": ARP packet allocation failed\n");
+               pr_err("ARP packet allocation failed\n");
                return;
        }
        if (vlan_id) {
                skb = vlan_put_tag(skb, vlan_id);
                if (!skb) {
-                       pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                       pr_err("failed to insert VLAN tag\n");
                        return;
                }
        }
@@ -2586,9 +2511,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
                if (rv) {
                        if (net_ratelimit()) {
-                               pr_warning(DRV_NAME
-                            ": %s: no route to arp_ip_target %pI4\n",
-                                      bond->dev->name, &fl.fl4_dst);
+                               pr_warning("%s: no route to arp_ip_target %pI4\n",
+                                          bond->dev->name, &fl.fl4_dst);
                        }
                        continue;
                }
@@ -2623,10 +2547,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                }
 
                if (net_ratelimit()) {
-                       pr_warning(DRV_NAME
-              ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                              bond->dev->name, &fl.fl4_dst,
-                              rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                       pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
+                                  bond->dev->name, &fl.fl4_dst,
+                                  rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
                }
                ip_rt_put(rt);
        }
@@ -2644,8 +2567,8 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
        struct vlan_entry *vlan;
        struct net_device *vlan_dev;
 
-       pr_debug("bond_send_grat_arp: bond %s slave %s\n", bond->dev->name,
-                               slave ? slave->dev->name : "NULL");
+       pr_debug("bond_send_grat_arp: bond %s slave %s\n",
+                bond->dev->name, slave ? slave->dev->name : "NULL");
 
        if (!slave || !bond->send_grat_arp ||
            test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
@@ -2674,7 +2597,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
 
        for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
                pr_debug("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
-                       &sip, &tip, i, &targets[i], bond_has_this_ip(bond, tip));
+                        &sip, &tip, i, &targets[i],
+                        bond_has_this_ip(bond, tip));
                if (sip == targets[i]) {
                        if (bond_has_this_ip(bond, tip))
                                slave->last_arp_rx = jiffies;
@@ -2698,8 +2622,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
        read_lock(&bond->lock);
 
        pr_debug("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
-               bond->dev->name, skb->dev ? skb->dev->name : "NULL",
-               orig_dev ? orig_dev->name : "NULL");
+                bond->dev->name, skb->dev ? skb->dev->name : "NULL",
+                orig_dev ? orig_dev->name : "NULL");
 
        slave = bond_get_slave_by_dev(bond, orig_dev);
        if (!slave || !slave_do_arp_validate(bond, slave))
@@ -2724,9 +2648,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
        memcpy(&tip, arp_ptr, 4);
 
        pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
-               bond->dev->name, slave->dev->name, slave->state,
-               bond->params.arp_validate, slave_do_arp_validate(bond, slave),
-               &sip, &tip);
+                bond->dev->name, slave->dev->name, slave->state,
+                bond->params.arp_validate, slave_do_arp_validate(bond, slave),
+                &sip, &tip);
 
        /*
         * Backup slaves won't see the ARP reply, but do come through
@@ -2800,17 +2724,14 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 * is closed.
                                 */
                                if (!oldcurrent) {
-                                       pr_info(DRV_NAME
-                                              ": %s: link status definitely "
-                                              "up for interface %s, ",
-                                              bond->dev->name,
-                                              slave->dev->name);
+                                       pr_info("%s: link status definitely up for interface %s, ",
+                                               bond->dev->name,
+                                               slave->dev->name);
                                        do_failover = 1;
                                } else {
-                                       pr_info(DRV_NAME
-                                              ": %s: interface %s is now up\n",
-                                              bond->dev->name,
-                                              slave->dev->name);
+                                       pr_info("%s: interface %s is now up\n",
+                                               bond->dev->name,
+                                               slave->dev->name);
                                }
                        }
                } else {
@@ -2829,10 +2750,9 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                if (slave->link_failure_count < UINT_MAX)
                                        slave->link_failure_count++;
 
-                               pr_info(DRV_NAME
-                                      ": %s: interface %s is now down.\n",
-                                      bond->dev->name,
-                                      slave->dev->name);
+                               pr_info("%s: interface %s is now down.\n",
+                                       bond->dev->name,
+                                       slave->dev->name);
 
                                if (slave == oldcurrent)
                                        do_failover = 1;
@@ -2965,9 +2885,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                slave->link = BOND_LINK_UP;
                                bond->current_arp_slave = NULL;
 
-                               pr_info(DRV_NAME
-                                       ": %s: link status definitely "
-                                       "up for interface %s.\n",
+                               pr_info("%s: link status definitely up for interface %s.\n",
                                        bond->dev->name, slave->dev->name);
 
                                if (!bond->curr_active_slave ||
@@ -2985,9 +2903,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                        slave->link = BOND_LINK_DOWN;
                        bond_set_slave_inactive_flags(slave);
 
-                       pr_info(DRV_NAME
-                               ": %s: link status definitely down for "
-                               "interface %s, disabling it\n",
+                       pr_info("%s: link status definitely down for interface %s, disabling it\n",
                                bond->dev->name, slave->dev->name);
 
                        if (slave == bond->curr_active_slave) {
@@ -2998,8 +2914,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                        continue;
 
                default:
-                       pr_err(DRV_NAME
-                              ": %s: impossible: new_link %d on slave %s\n",
+                       pr_err("%s: impossible: new_link %d on slave %s\n",
                               bond->dev->name, slave->new_link,
                               slave->dev->name);
                        continue;
@@ -3028,9 +2943,9 @@ static void bond_ab_arp_probe(struct bonding *bond)
        read_lock(&bond->curr_slave_lock);
 
        if (bond->current_arp_slave && bond->curr_active_slave)
-               pr_info(DRV_NAME "PROBE: c_arp %s && cas %s BAD\n",
-                      bond->current_arp_slave->dev->name,
-                      bond->curr_active_slave->dev->name);
+               pr_info("PROBE: c_arp %s && cas %s BAD\n",
+                       bond->current_arp_slave->dev->name,
+                       bond->curr_active_slave->dev->name);
 
        if (bond->curr_active_slave) {
                bond_arp_send_all(bond, bond->curr_active_slave);
@@ -3078,9 +2993,8 @@ static void bond_ab_arp_probe(struct bonding *bond)
 
                        bond_set_slave_inactive_flags(slave);
 
-                       pr_info(DRV_NAME
-                              ": %s: backup interface %s is now down.\n",
-                              bond->dev->name, slave->dev->name);
+                       pr_info("%s: backup interface %s is now down.\n",
+                               bond->dev->name, slave->dev->name);
                }
        }
 }
@@ -3360,9 +3274,8 @@ static void bond_create_proc_entry(struct bonding *bond)
                                                    S_IRUGO, bn->proc_dir,
                                                    &bond_info_fops, bond);
                if (bond->proc_entry == NULL)
-                       pr_warning(DRV_NAME
-                              ": Warning: Cannot create /proc/net/%s/%s\n",
-                              DRV_NAME, bond_dev->name);
+                       pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
+                                  DRV_NAME, bond_dev->name);
                else
                        memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
        }
@@ -3388,9 +3301,8 @@ static void bond_create_proc_dir(struct bond_net *bn)
        if (!bn->proc_dir) {
                bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
                if (!bn->proc_dir)
-                       pr_warning(DRV_NAME
-                               ": Warning: cannot create /proc/net/%s\n",
-                               DRV_NAME);
+                       pr_warning("Warning: cannot create /proc/net/%s\n",
+                                  DRV_NAME);
        }
 }
 
@@ -3539,8 +3451,8 @@ static int bond_netdev_event(struct notifier_block *this,
        struct net_device *event_dev = (struct net_device *)ptr;
 
        pr_debug("event_dev: %s, event: %lx\n",
-               (event_dev ? event_dev->name : "None"),
-               event);
+                event_dev ? event_dev->name : "None",
+                event);
 
        if (!(event_dev->priv_flags & IFF_BONDING))
                return NOTIFY_DONE;
@@ -3875,8 +3787,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
        struct mii_ioctl_data *mii = NULL;
        int res = 0;
 
-       pr_debug("bond_ioctl: master=%s, cmd=%d\n",
-               bond_dev->name, cmd);
+       pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd);
 
        switch (cmd) {
        case SIOCGMIIPHY:
@@ -3945,12 +3856,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
        slave_dev = dev_get_by_name(dev_net(bond_dev), ifr->ifr_slave);
 
-       pr_debug("slave_dev=%p: \n", slave_dev);
+       pr_debug("slave_dev=%p:\n", slave_dev);
 
        if (!slave_dev)
                res = -ENODEV;
        else {
-               pr_debug("slave_dev->name=%s: \n", slave_dev->name);
+               pr_debug("slave_dev->name=%s:\n", slave_dev->name);
                switch (cmd) {
                case BOND_ENSLAVE_OLD:
                case SIOCBONDENSLAVE:
@@ -4059,7 +3970,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
        int i;
 
        pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond,
-               (bond_dev ? bond_dev->name : "None"), new_mtu);
+                (bond_dev ? bond_dev->name : "None"), new_mtu);
 
        /* Can't hold bond->lock with bh disabled here since
         * some base drivers panic. On the other hand we can't
@@ -4077,8 +3988,10 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
         */
 
        bond_for_each_slave(bond, slave, i) {
-               pr_debug("s %p s->p %p c_m %p\n", slave,
-                       slave->prev, slave->dev->netdev_ops->ndo_change_mtu);
+               pr_debug("s %p s->p %p c_m %p\n",
+                        slave,
+                        slave->prev,
+                        slave->dev->netdev_ops->ndo_change_mtu);
 
                res = dev_set_mtu(slave->dev, new_mtu);
 
@@ -4108,8 +4021,8 @@ unwind:
 
                tmp_res = dev_set_mtu(slave->dev, bond_dev->mtu);
                if (tmp_res) {
-                       pr_debug("unwind err %d dev %s\n", tmp_res,
-                               slave->dev->name);
+                       pr_debug("unwind err %d dev %s\n",
+                                tmp_res, slave->dev->name);
                }
        }
 
@@ -4135,7 +4048,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
                return bond_alb_set_mac_address(bond_dev, addr);
 
 
-       pr_debug("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
+       pr_debug("bond=%p, name=%s\n",
+                bond, bond_dev ? bond_dev->name : "None");
 
        /*
         * If fail_over_mac is set to active, do nothing and return
@@ -4200,8 +4114,8 @@ unwind:
 
                tmp_res = dev_set_mac_address(slave->dev, &tmp_sa);
                if (tmp_res) {
-                       pr_debug("unwind err %d dev %s\n", tmp_res,
-                               slave->dev->name);
+                       pr_debug("unwind err %d dev %s\n",
+                                tmp_res, slave->dev->name);
                }
        }
 
@@ -4357,9 +4271,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
                        if (tx_dev) {
                                struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                if (!skb2) {
-                                       pr_err(DRV_NAME
-                                              ": %s: Error: bond_xmit_broadcast(): "
-                                              "skb_clone() failed\n",
+                                       pr_err("%s: Error: bond_xmit_broadcast(): skb_clone() failed\n",
                                               bond_dev->name);
                                        continue;
                                }
@@ -4425,8 +4337,8 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
                return bond_alb_xmit(skb, dev);
        default:
                /* Should never happen, mode already checked */
-               pr_err(DRV_NAME ": %s: Error: Unknown bonding mode %d\n",
-                    dev->name, bond->params.mode);
+               pr_err("%s: Error: Unknown bonding mode %d\n",
+                      dev->name, bond->params.mode);
                WARN_ON_ONCE(1);
                dev_kfree_skb(skb);
                return NETDEV_TX_OK;
@@ -4462,10 +4374,8 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                break;
        default:
                /* Should never happen, mode already checked */
-               pr_err(DRV_NAME
-                      ": %s: Error: Unknown bonding mode %d\n",
-                      bond_dev->name,
-                      mode);
+               pr_err("%s: Error: Unknown bonding mode %d\n",
+                      bond_dev->name, mode);
                break;
        }
 }
@@ -4650,8 +4560,7 @@ static int bond_check_params(struct bond_params *params)
        if (mode) {
                bond_mode = bond_parse_parm(mode, bond_mode_tbl);
                if (bond_mode == -1) {
-                       pr_err(DRV_NAME
-                              ": Error: Invalid bonding mode \"%s\"\n",
+                       pr_err("Error: Invalid bonding mode \"%s\"\n",
                               mode == NULL ? "NULL" : mode);
                        return -EINVAL;
                }
@@ -4660,16 +4569,13 @@ static int bond_check_params(struct bond_params *params)
        if (xmit_hash_policy) {
                if ((bond_mode != BOND_MODE_XOR) &&
                    (bond_mode != BOND_MODE_8023AD)) {
-                       pr_info(DRV_NAME
-                               ": xmit_hash_policy param is irrelevant in"
-                               " mode %s\n",
+                       pr_info("xmit_hash_policy param is irrelevant in mode %s\n",
                               bond_mode_name(bond_mode));
                } else {
                        xmit_hashtype = bond_parse_parm(xmit_hash_policy,
                                                        xmit_hashtype_tbl);
                        if (xmit_hashtype == -1) {
-                               pr_err(DRV_NAME
-                                      ": Error: Invalid xmit_hash_policy \"%s\"\n",
+                               pr_err("Error: Invalid xmit_hash_policy \"%s\"\n",
                                       xmit_hash_policy == NULL ? "NULL" :
                                       xmit_hash_policy);
                                return -EINVAL;
@@ -4679,14 +4585,12 @@ static int bond_check_params(struct bond_params *params)
 
        if (lacp_rate) {
                if (bond_mode != BOND_MODE_8023AD) {
-                       pr_info(DRV_NAME
-                              ": lacp_rate param is irrelevant in mode %s\n",
-                              bond_mode_name(bond_mode));
+                       pr_info("lacp_rate param is irrelevant in mode %s\n",
+                               bond_mode_name(bond_mode));
                } else {
                        lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
                        if (lacp_fast == -1) {
-                               pr_err(DRV_NAME
-                                      ": Error: Invalid lacp rate \"%s\"\n",
+                               pr_err("Error: Invalid lacp rate \"%s\"\n",
                                       lacp_rate == NULL ? "NULL" : lacp_rate);
                                return -EINVAL;
                        }
@@ -4696,82 +4600,64 @@ static int bond_check_params(struct bond_params *params)
        if (ad_select) {
                params->ad_select = bond_parse_parm(ad_select, ad_select_tbl);
                if (params->ad_select == -1) {
-                       pr_err(DRV_NAME
-                              ": Error: Invalid ad_select \"%s\"\n",
+                       pr_err("Error: Invalid ad_select \"%s\"\n",
                               ad_select == NULL ? "NULL" : ad_select);
                        return -EINVAL;
                }
 
                if (bond_mode != BOND_MODE_8023AD) {
-                       pr_warning(DRV_NAME
-                              ": ad_select param only affects 802.3ad mode\n");
+                       pr_warning("ad_select param only affects 802.3ad mode\n");
                }
        } else {
                params->ad_select = BOND_AD_STABLE;
        }
 
        if (max_bonds < 0) {
-               pr_warning(DRV_NAME
-                      ": Warning: max_bonds (%d) not in range %d-%d, so it "
-                      "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
-                      max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
+               pr_warning("Warning: max_bonds (%d) not in range %d-%d, so it was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
+                          max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
                max_bonds = BOND_DEFAULT_MAX_BONDS;
        }
 
        if (miimon < 0) {
-               pr_warning(DRV_NAME
-                      ": Warning: miimon module parameter (%d), "
-                      "not in range 0-%d, so it was reset to %d\n",
-                      miimon, INT_MAX, BOND_LINK_MON_INTERV);
+               pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to %d\n",
+                          miimon, INT_MAX, BOND_LINK_MON_INTERV);
                miimon = BOND_LINK_MON_INTERV;
        }
 
        if (updelay < 0) {
-               pr_warning(DRV_NAME
-                      ": Warning: updelay module parameter (%d), "
-                      "not in range 0-%d, so it was reset to 0\n",
-                      updelay, INT_MAX);
+               pr_warning("Warning: updelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                          updelay, INT_MAX);
                updelay = 0;
        }
 
        if (downdelay < 0) {
-               pr_warning(DRV_NAME
-                      ": Warning: downdelay module parameter (%d), "
-                      "not in range 0-%d, so it was reset to 0\n",
-                      downdelay, INT_MAX);
+               pr_warning("Warning: downdelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                          downdelay, INT_MAX);
                downdelay = 0;
        }
 
        if ((use_carrier != 0) && (use_carrier != 1)) {
-               pr_warning(DRV_NAME
-                      ": Warning: use_carrier module parameter (%d), "
-                      "not of valid value (0/1), so it was set to 1\n",
-                      use_carrier);
+               pr_warning("Warning: use_carrier module parameter (%d), not of valid value (0/1), so it was set to 1\n",
+                          use_carrier);
                use_carrier = 1;
        }
 
        if (num_grat_arp < 0 || num_grat_arp > 255) {
-               pr_warning(DRV_NAME
-                      ": Warning: num_grat_arp (%d) not in range 0-255 so it "
-                      "was reset to 1 \n", num_grat_arp);
+               pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1 \n",
+                          num_grat_arp);
                num_grat_arp = 1;
        }
 
        if (num_unsol_na < 0 || num_unsol_na > 255) {
-               pr_warning(DRV_NAME
-                      ": Warning: num_unsol_na (%d) not in range 0-255 so it "
-                      "was reset to 1 \n", num_unsol_na);
+               pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1 \n",
+                          num_unsol_na);
                num_unsol_na = 1;
        }
 
        /* reset values for 802.3ad */
        if (bond_mode == BOND_MODE_8023AD) {
                if (!miimon) {
-                       pr_warning(DRV_NAME
-                              ": Warning: miimon must be specified, "
-                              "otherwise bonding will not detect link "
-                              "failure, speed and duplex which are "
-                              "essential for 802.3ad operation\n");
+                       pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure, speed and duplex which are essential for 802.3ad operation\n");
                        pr_warning("Forcing miimon to 100msec\n");
                        miimon = 100;
                }
@@ -4781,24 +4667,15 @@ static int bond_check_params(struct bond_params *params)
        if ((bond_mode == BOND_MODE_TLB) ||
            (bond_mode == BOND_MODE_ALB)) {
                if (!miimon) {
-                       pr_warning(DRV_NAME
-                              ": Warning: miimon must be specified, "
-                              "otherwise bonding will not detect link "
-                              "failure and link speed which are essential "
-                              "for TLB/ALB load balancing\n");
+                       pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure and link speed which are essential for TLB/ALB load balancing\n");
                        pr_warning("Forcing miimon to 100msec\n");
                        miimon = 100;
                }
        }
 
        if (bond_mode == BOND_MODE_ALB) {
-               pr_notice(DRV_NAME
-                      ": In ALB mode you might experience client "
-                      "disconnections upon reconnection of a link if the "
-                      "bonding module updelay parameter (%d msec) is "
-                      "incompatible with the forwarding delay time of the "
-                      "switch\n",
-                      updelay);
+               pr_notice("In ALB mode you might experience client disconnections upon reconnection of a link if the bonding module updelay parameter (%d msec) is incompatible with the forwarding delay time of the switch\n",
+                         updelay);
        }
 
        if (!miimon) {
@@ -4806,49 +4683,37 @@ static int bond_check_params(struct bond_params *params)
                        /* just warn the user the up/down delay will have
                         * no effect since miimon is zero...
                         */
-                       pr_warning(DRV_NAME
-                              ": Warning: miimon module parameter not set "
-                              "and updelay (%d) or downdelay (%d) module "
-                              "parameter is set; updelay and downdelay have "
-                              "no effect unless miimon is set\n",
-                              updelay, downdelay);
+                       pr_warning("Warning: miimon module parameter not set and updelay (%d) or downdelay (%d) module parameter is set; updelay and downdelay have no effect unless miimon is set\n",
+                                  updelay, downdelay);
                }
        } else {
                /* don't allow arp monitoring */
                if (arp_interval) {
-                       pr_warning(DRV_NAME
-                              ": Warning: miimon (%d) and arp_interval (%d) "
-                              "can't be used simultaneously, disabling ARP "
-                              "monitoring\n",
-                              miimon, arp_interval);
+                       pr_warning("Warning: miimon (%d) and arp_interval (%d) can't be used simultaneously, disabling ARP monitoring\n",
+                                  miimon, arp_interval);
                        arp_interval = 0;
                }
 
                if ((updelay % miimon) != 0) {
-                       pr_warning(DRV_NAME
-                              ": Warning: updelay (%d) is not a multiple "
-                              "of miimon (%d), updelay rounded to %d ms\n",
-                              updelay, miimon, (updelay / miimon) * miimon);
+                       pr_warning("Warning: updelay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
+                                  updelay, miimon,
+                                  (updelay / miimon) * miimon);
                }
 
                updelay /= miimon;
 
                if ((downdelay % miimon) != 0) {
-                       pr_warning(DRV_NAME
-                              ": Warning: downdelay (%d) is not a multiple "
-                              "of miimon (%d), downdelay rounded to %d ms\n",
-                              downdelay, miimon,
-                              (downdelay / miimon) * miimon);
+                       pr_warning("Warning: downdelay (%d) is not a multiple of miimon (%d), downdelay rounded to %d ms\n",
+                                  downdelay, miimon,
+                                  (downdelay / miimon) * miimon);
                }
 
                downdelay /= miimon;
        }
 
        if (arp_interval < 0) {
-               pr_warning(DRV_NAME
-                      ": Warning: arp_interval module parameter (%d) "
-                      ", not in range 0-%d, so it was reset to %d\n",
-                      arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
+               pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to %d\n",
+                          arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
                arp_interval = BOND_LINK_ARP_INTERV;
        }
 
@@ -4858,10 +4723,8 @@ static int bond_check_params(struct bond_params *params)
                /* not complete check, but should be good enough to
                   catch mistakes */
                if (!isdigit(arp_ip_target[arp_ip_count][0])) {
-                       pr_warning(DRV_NAME
-                              ": Warning: bad arp_ip_target module parameter "
-                              "(%s), ARP monitoring will not be performed\n",
-                              arp_ip_target[arp_ip_count]);
+                       pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
+                                  arp_ip_target[arp_ip_count]);
                        arp_interval = 0;
                } else {
                        __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
@@ -4871,31 +4734,25 @@ static int bond_check_params(struct bond_params *params)
 
        if (arp_interval && !arp_ip_count) {
                /* don't allow arping if no arp_ip_target given... */
-               pr_warning(DRV_NAME
-                      ": Warning: arp_interval module parameter (%d) "
-                      "specified without providing an arp_ip_target "
-                      "parameter, arp_interval was reset to 0\n",
-                      arp_interval);
+               pr_warning("Warning: arp_interval module parameter (%d) specified without providing an arp_ip_target parameter, arp_interval was reset to 0\n",
+                          arp_interval);
                arp_interval = 0;
        }
 
        if (arp_validate) {
                if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
-                       pr_err(DRV_NAME
-                              ": arp_validate only supported in active-backup mode\n");
+                       pr_err("arp_validate only supported in active-backup mode\n");
                        return -EINVAL;
                }
                if (!arp_interval) {
-                       pr_err(DRV_NAME
-                              ": arp_validate requires arp_interval\n");
+                       pr_err("arp_validate requires arp_interval\n");
                        return -EINVAL;
                }
 
                arp_validate_value = bond_parse_parm(arp_validate,
                                                     arp_validate_tbl);
                if (arp_validate_value == -1) {
-                       pr_err(DRV_NAME
-                              ": Error: invalid arp_validate \"%s\"\n",
+                       pr_err("Error: invalid arp_validate \"%s\"\n",
                               arp_validate == NULL ? "NULL" : arp_validate);
                        return -EINVAL;
                }
@@ -4903,17 +4760,14 @@ static int bond_check_params(struct bond_params *params)
                arp_validate_value = 0;
 
        if (miimon) {
-               pr_info(DRV_NAME
-                      ": MII link monitoring set to %d ms\n",
-                      miimon);
+               pr_info("MII link monitoring set to %d ms\n", miimon);
        } else if (arp_interval) {
                int i;
 
-               pr_info(DRV_NAME ": ARP monitoring set to %d ms,"
-                      " validate %s, with %d target(s):",
-                      arp_interval,
-                      arp_validate_tbl[arp_validate_value].modename,
-                      arp_ip_count);
+               pr_info("ARP monitoring set to %d ms, validate %s, with %d target(s):",
+                       arp_interval,
+                       arp_validate_tbl[arp_validate_value].modename,
+                       arp_ip_count);
 
                for (i = 0; i < arp_ip_count; i++)
                        pr_info(" %s", arp_ip_target[i]);
@@ -4924,21 +4778,15 @@ static int bond_check_params(struct bond_params *params)
                /* miimon and arp_interval not set, we need one so things
                 * work as expected, see bonding.txt for details
                 */
-               pr_warning(DRV_NAME
-                      ": Warning: either miimon or arp_interval and "
-                      "arp_ip_target module parameters must be specified, "
-                      "otherwise bonding will not detect link failures! see "
-                      "bonding.txt for details.\n");
+               pr_warning("Warning: either miimon or arp_interval and arp_ip_target module parameters must be specified, otherwise bonding will not detect link failures! see bonding.txt for details.\n");
        }
 
        if (primary && !USES_PRIMARY(bond_mode)) {
                /* currently, using a primary only makes sense
                 * in active backup, TLB or ALB modes
                 */
-               pr_warning(DRV_NAME
-                      ": Warning: %s primary device specified but has no "
-                      "effect in %s mode\n",
-                      primary, bond_mode_name(bond_mode));
+               pr_warning("Warning: %s primary device specified but has no effect in %s mode\n",
+                          primary, bond_mode_name(bond_mode));
                primary = NULL;
        }
 
@@ -4946,8 +4794,7 @@ static int bond_check_params(struct bond_params *params)
                primary_reselect_value = bond_parse_parm(primary_reselect,
                                                         pri_reselect_tbl);
                if (primary_reselect_value == -1) {
-                       pr_err(DRV_NAME
-                              ": Error: Invalid primary_reselect \"%s\"\n",
+                       pr_err("Error: Invalid primary_reselect \"%s\"\n",
                               primary_reselect ==
                                        NULL ? "NULL" : primary_reselect);
                        return -EINVAL;
@@ -4960,16 +4807,13 @@ static int bond_check_params(struct bond_params *params)
                fail_over_mac_value = bond_parse_parm(fail_over_mac,
                                                      fail_over_mac_tbl);
                if (fail_over_mac_value == -1) {
-                       pr_err(DRV_NAME
-                              ": Error: invalid fail_over_mac \"%s\"\n",
+                       pr_err("Error: invalid fail_over_mac \"%s\"\n",
                               arp_validate == NULL ? "NULL" : arp_validate);
                        return -EINVAL;
                }
 
                if (bond_mode != BOND_MODE_ACTIVEBACKUP)
-                       pr_warning(DRV_NAME
-                              ": Warning: fail_over_mac only affects "
-                              "active-backup mode.\n");
+                       pr_warning("Warning: fail_over_mac only affects active-backup mode.\n");
        } else {
                fail_over_mac_value = BOND_FOM_NONE;
        }
@@ -5076,8 +4920,7 @@ int bond_create(struct net *net, const char *name)
        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                bond_setup);
        if (!bond_dev) {
-               pr_err(DRV_NAME ": %s: eek! can't alloc netdev!\n",
-                      name);
+               pr_err("%s: eek! can't alloc netdev!\n", name);
                res = -ENOMEM;
                goto out;
        }
index 4e00b4f836411eabb4fcc41959c5415bc9bcb13d..5acd557cea9ba7ab4c4cbcb36323dccee02bff20 100644 (file)
@@ -19,6 +19,9 @@
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -109,11 +112,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                goto err_no_cmd;
 
        if (command[0] == '+') {
-               pr_info(DRV_NAME
-                       ": %s is being created...\n", ifname);
+               pr_info("%s is being created...\n", ifname);
                rv = bond_create(net, ifname);
                if (rv) {
-                       pr_info(DRV_NAME ": Bond creation failed.\n");
+                       pr_info("Bond creation failed.\n");
                        res = rv;
                }
        } else if (command[0] == '-') {
@@ -122,12 +124,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                rtnl_lock();
                bond_dev = bond_get_by_name(net, ifname);
                if (bond_dev) {
-                       pr_info(DRV_NAME ": %s is being deleted...\n",
-                               ifname);
+                       pr_info("%s is being deleted...\n", ifname);
                        unregister_netdevice(bond_dev);
                } else {
-                       pr_err(DRV_NAME ": unable to delete non-existent %s\n",
-                              ifname);
+                       pr_err("unable to delete non-existent %s\n", ifname);
                        res = -ENODEV;
                }
                rtnl_unlock();
@@ -140,8 +140,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
        return res;
 
 err_no_cmd:
-       pr_err(DRV_NAME ": no command found in bonding_masters."
-              " Use +ifname or -ifname.\n");
+       pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
        return -EPERM;
 }
 
@@ -225,8 +224,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 
        /* Quick sanity check -- is the bond interface up? */
        if (!(bond->dev->flags & IFF_UP)) {
-               pr_warning(DRV_NAME ": %s: doing slave updates when "
-                          "interface is down.\n", bond->dev->name);
+               pr_warning("%s: doing slave updates when interface is down.\n",
+                          bond->dev->name);
        }
 
        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
@@ -247,17 +246,14 @@ static ssize_t bonding_store_slaves(struct device *d,
 
                dev = __dev_get_by_name(dev_net(bond->dev), ifname);
                if (!dev) {
-                       pr_info(DRV_NAME
-                              ": %s: Interface %s does not exist!\n",
-                              bond->dev->name, ifname);
+                       pr_info("%s: Interface %s does not exist!\n",
+                               bond->dev->name, ifname);
                        ret = -ENODEV;
                        goto out;
                }
 
                if (dev->flags & IFF_UP) {
-                       pr_err(DRV_NAME
-                              ": %s: Error: Unable to enslave %s "
-                              "because it is already up.\n",
+                       pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
                               bond->dev->name, dev->name);
                        ret = -EPERM;
                        goto out;
@@ -266,8 +262,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                read_lock(&bond->lock);
                bond_for_each_slave(bond, slave, i)
                        if (slave->dev == dev) {
-                               pr_err(DRV_NAME
-                                      ": %s: Interface %s is already enslaved!\n",
+                               pr_err("%s: Interface %s is already enslaved!\n",
                                       bond->dev->name, ifname);
                                ret = -EPERM;
                                read_unlock(&bond->lock);
@@ -275,8 +270,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                        }
                read_unlock(&bond->lock);
 
-               pr_info(DRV_NAME ": %s: Adding slave %s.\n",
-                       bond->dev->name, ifname);
+               pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
 
                /* If this is the first slave, then we need to set
                   the master's hardware address to be the same as the
@@ -313,7 +307,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                                break;
                        }
                if (dev) {
-                       pr_info(DRV_NAME ": %s: Removing slave %s\n",
+                       pr_info("%s: Removing slave %s\n",
                                bond->dev->name, dev->name);
                                res = bond_release(bond->dev, dev);
                        if (res) {
@@ -323,16 +317,16 @@ static ssize_t bonding_store_slaves(struct device *d,
                        /* set the slave MTU to the default */
                        dev_set_mtu(dev, original_mtu);
                } else {
-                       pr_err(DRV_NAME ": unable to remove non-existent"
-                              " slave %s for bond %s.\n",
-                               ifname, bond->dev->name);
+                       pr_err("unable to remove non-existent slave %s for bond %s.\n",
+                              ifname, bond->dev->name);
                        ret = -ENODEV;
                }
                goto out;
        }
 
 err_no_cmd:
-       pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+       pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
+              bond->dev->name);
        ret = -EPERM;
 
 out:
@@ -365,18 +359,16 @@ static ssize_t bonding_store_mode(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME ": unable to update mode of %s"
-                      " because interface is up.\n", bond->dev->name);
+               pr_err("unable to update mode of %s because interface is up.\n",
+                      bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        new_value = bond_parse_parm(buf, bond_mode_tbl);
        if (new_value < 0)  {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid mode value %.*s.\n",
-                      bond->dev->name,
-                      (int)strlen(buf) - 1, buf);
+               pr_err("%s: Ignoring invalid mode value %.*s.\n",
+                      bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
                goto out;
        } else {
@@ -388,8 +380,8 @@ static ssize_t bonding_store_mode(struct device *d,
 
                bond->params.mode = new_value;
                bond_set_mode_ops(bond, bond->params.mode);
-               pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
-                      bond->dev->name, bond_mode_tbl[new_value].modename,
+               pr_info("%s: setting mode to %s (%d).\n",
+                       bond->dev->name, bond_mode_tbl[new_value].modename,
                       new_value);
        }
 out:
@@ -421,8 +413,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME
-                      "%s: Interface is up. Unable to update xmit policy.\n",
+               pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
@@ -430,8 +421,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
        new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
        if (new_value < 0)  {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+               pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
                       bond->dev->name,
                       (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
@@ -439,7 +429,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
        } else {
                bond->params.xmit_policy = new_value;
                bond_set_mode_ops(bond, bond->params.mode);
-               pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+               pr_info("%s: setting xmit hash policy to %s (%d).\n",
                        bond->dev->name,
                        xmit_hashtype_tbl[new_value].modename, new_value);
        }
@@ -472,20 +462,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
        new_value = bond_parse_parm(buf, arp_validate_tbl);
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid arp_validate value %s\n",
+               pr_err("%s: Ignoring invalid arp_validate value %s\n",
                       bond->dev->name, buf);
                return -EINVAL;
        }
        if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-               pr_err(DRV_NAME
-                      ": %s: arp_validate only supported in active-backup mode.\n",
+               pr_err("%s: arp_validate only supported in active-backup mode.\n",
                       bond->dev->name);
                return -EINVAL;
        }
-       pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
-              bond->dev->name, arp_validate_tbl[new_value].modename,
-              new_value);
+       pr_info("%s: setting arp_validate to %s (%d).\n",
+               bond->dev->name, arp_validate_tbl[new_value].modename,
+               new_value);
 
        if (!bond->params.arp_validate && new_value)
                bond_register_arp(bond);
@@ -523,24 +511,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->slave_cnt != 0) {
-               pr_err(DRV_NAME
-                      ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+               pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
                       bond->dev->name);
                return -EPERM;
        }
 
        new_value = bond_parse_parm(buf, fail_over_mac_tbl);
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid fail_over_mac value %s.\n",
+               pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
                       bond->dev->name, buf);
                return -EINVAL;
        }
 
        bond->params.fail_over_mac = new_value;
-       pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
-              bond->dev->name, fail_over_mac_tbl[new_value].modename,
-              new_value);
+       pr_info("%s: Setting fail_over_mac to %s (%d).\n",
+               bond->dev->name, fail_over_mac_tbl[new_value].modename,
+               new_value);
 
        return count;
 }
@@ -571,31 +557,26 @@ static ssize_t bonding_store_arp_interval(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no arp_interval value specified.\n",
+               pr_err("%s: no arp_interval value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+               pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                       bond->dev->name, new_value, INT_MAX);
                ret = -EINVAL;
                goto out;
        }
 
-       pr_info(DRV_NAME
-              ": %s: Setting ARP monitoring interval to %d.\n",
-              bond->dev->name, new_value);
+       pr_info("%s: Setting ARP monitoring interval to %d.\n",
+               bond->dev->name, new_value);
        bond->params.arp_interval = new_value;
        if (bond->params.arp_interval)
                bond->dev->priv_flags |= IFF_MASTER_ARPMON;
        if (bond->params.miimon) {
-               pr_info(DRV_NAME
-                      ": %s: ARP monitoring cannot be used with MII monitoring. "
-                      "%s Disabling MII monitoring.\n",
-                      bond->dev->name, bond->dev->name);
+               pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
+                       bond->dev->name, bond->dev->name);
                bond->params.miimon = 0;
                if (delayed_work_pending(&bond->mii_work)) {
                        cancel_delayed_work(&bond->mii_work);
@@ -603,10 +584,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                }
        }
        if (!bond->params.arp_targets[0]) {
-               pr_info(DRV_NAME
-                      ": %s: ARP monitoring has been set up, "
-                      "but no ARP targets have been specified.\n",
-                      bond->dev->name);
+               pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
+                       bond->dev->name);
        }
        if (bond->dev->flags & IFF_UP) {
                /* If the interface is up, we may need to fire off
@@ -666,8 +645,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
        /* look for adds */
        if (buf[0] == '+') {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                       pr_err(DRV_NAME
-                              ": %s: invalid ARP target %pI4 specified for addition\n",
+                       pr_err("%s: invalid ARP target %pI4 specified for addition\n",
                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
@@ -675,23 +653,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                /* look for an empty slot to put the target in, and check for dupes */
                for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) { /* duplicate */
-                               pr_err(DRV_NAME
-                                      ": %s: ARP target %pI4 is already present\n",
+                               pr_err("%s: ARP target %pI4 is already present\n",
                                       bond->dev->name, &newtarget);
                                ret = -EINVAL;
                                goto out;
                        }
                        if (targets[i] == 0) {
-                               pr_info(DRV_NAME
-                                      ": %s: adding ARP target %pI4.\n",
-                                      bond->dev->name, &newtarget);
+                               pr_info("%s: adding ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                done = 1;
                                targets[i] = newtarget;
                        }
                }
                if (!done) {
-                       pr_err(DRV_NAME
-                              ": %s: ARP target table is full!\n",
+                       pr_err("%s: ARP target table is full!\n",
                               bond->dev->name);
                        ret = -EINVAL;
                        goto out;
@@ -699,8 +674,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 
        } else if (buf[0] == '-')       {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                       pr_err(DRV_NAME
-                              ": %s: invalid ARP target %pI4 specified for removal\n",
+                       pr_err("%s: invalid ARP target %pI4 specified for removal\n",
                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
@@ -709,9 +683,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                        if (targets[i] == newtarget) {
                                int j;
-                               pr_info(DRV_NAME
-                                      ": %s: removing ARP target %pI4.\n",
-                                      bond->dev->name, &newtarget);
+                               pr_info("%s: removing ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
                                        targets[j] = targets[j+1];
 
@@ -720,16 +693,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                        }
                }
                if (!done) {
-                       pr_info(DRV_NAME
-                              ": %s: unable to remove nonexistent ARP target %pI4.\n",
-                              bond->dev->name, &newtarget);
+                       pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                               bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
        } else {
-               pr_err(DRV_NAME ": no command found in arp_ip_targets file"
-                      " for bond %s. Use +<addr> or -<addr>.\n",
-                       bond->dev->name);
+               pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                      bond->dev->name);
                ret = -EPERM;
                goto out;
        }
@@ -761,41 +732,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to set down delay as MII monitoring is disabled\n",
+               pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no down delay value specified.\n",
-                      bond->dev->name);
+               pr_err("%s: no down delay value specified.\n", bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
                if ((new_value % bond->params.miimon) != 0) {
-                       pr_warning(DRV_NAME
-                                  ": %s: Warning: down delay (%d) is not a "
-                                  "multiple of miimon (%d), delay rounded "
-                                  "to %d ms\n",
+                       pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
                                   bond->dev->name, new_value,
                                   bond->params.miimon,
                                   (new_value / bond->params.miimon) *
                                   bond->params.miimon);
                }
                bond->params.downdelay = new_value / bond->params.miimon;
-               pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
-                      bond->dev->name,
-                      bond->params.downdelay * bond->params.miimon);
+               pr_info("%s: Setting down delay to %d.\n",
+                       bond->dev->name,
+                       bond->params.downdelay * bond->params.miimon);
 
        }
 
@@ -823,41 +787,35 @@ static ssize_t bonding_store_updelay(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (!(bond->params.miimon)) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to set up delay as MII monitoring is disabled\n",
+               pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no up delay value specified.\n",
+               pr_err("%s: no up delay value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
                if ((new_value % bond->params.miimon) != 0) {
-                       pr_warning(DRV_NAME
-                                  ": %s: Warning: up delay (%d) is not a "
-                                  "multiple of miimon (%d), updelay rounded "
-                                  "to %d ms\n",
+                       pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
                                   bond->dev->name, new_value,
                                   bond->params.miimon,
                                   (new_value / bond->params.miimon) *
                                   bond->params.miimon);
                }
                bond->params.updelay = new_value / bond->params.miimon;
-               pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
-                      bond->dev->name, bond->params.updelay * bond->params.miimon);
-
+               pr_info("%s: Setting up delay to %d.\n",
+                       bond->dev->name,
+                       bond->params.updelay * bond->params.miimon);
        }
 
 out:
@@ -889,16 +847,14 @@ static ssize_t bonding_store_lacp(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to update LACP rate because interface is up.\n",
+               pr_err("%s: Unable to update LACP rate because interface is up.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
        }
 
        if (bond->params.mode != BOND_MODE_8023AD) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+               pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                       bond->dev->name);
                ret = -EPERM;
                goto out;
@@ -908,12 +864,11 @@ static ssize_t bonding_store_lacp(struct device *d,
 
        if ((new_value == 1) || (new_value == 0)) {
                bond->params.lacp_fast = new_value;
-               pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+               pr_info("%s: Setting LACP rate to %s (%d).\n",
                        bond->dev->name, bond_lacp_tbl[new_value].modename,
                        new_value);
        } else {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid LACP rate value %.*s.\n",
+               pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
                       bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
        }
@@ -943,9 +898,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (bond->dev->flags & IFF_UP) {
-               pr_err(DRV_NAME
-                      ": %s: Unable to update ad_select because interface "
-                      "is up.\n", bond->dev->name);
+               pr_err("%s: Unable to update ad_select because interface is up.\n",
+                      bond->dev->name);
                ret = -EPERM;
                goto out;
        }
@@ -954,13 +908,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
        if (new_value != -1) {
                bond->params.ad_select = new_value;
-               pr_info(DRV_NAME
-                      ": %s: Setting ad_select to %s (%d).\n",
-                      bond->dev->name, ad_select_tbl[new_value].modename,
-                      new_value);
+               pr_info("%s: Setting ad_select to %s (%d).\n",
+                       bond->dev->name, ad_select_tbl[new_value].modename,
+                       new_value);
        } else {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid ad_select value %.*s.\n",
+               pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
                       bond->dev->name, (int)strlen(buf) - 1, buf);
                ret = -EINVAL;
        }
@@ -990,15 +942,13 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no num_grat_arp value specified.\n",
+               pr_err("%s: no num_grat_arp value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0 || new_value > 255) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
+               pr_err("%s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
                       bond->dev->name, new_value);
                ret = -EINVAL;
                goto out;
@@ -1031,16 +981,14 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no num_unsol_na value specified.\n",
+               pr_err("%s: no num_unsol_na value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
 
        if (new_value < 0 || new_value > 255) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
+               pr_err("%s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
                       bond->dev->name, new_value);
                ret = -EINVAL;
                goto out;
@@ -1075,40 +1023,31 @@ static ssize_t bonding_store_miimon(struct device *d,
        struct bonding *bond = to_bond(d);
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no miimon value specified.\n",
+               pr_err("%s: no miimon value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if (new_value < 0) {
-               pr_err(DRV_NAME
-                      ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+               pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                       bond->dev->name, new_value, 1, INT_MAX);
                ret = -EINVAL;
                goto out;
        } else {
-               pr_info(DRV_NAME
-                      ": %s: Setting MII monitoring interval to %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Setting MII monitoring interval to %d.\n",
+                       bond->dev->name, new_value);
                bond->params.miimon = new_value;
                if (bond->params.updelay)
-                       pr_info(DRV_NAME
-                             ": %s: Note: Updating updelay (to %d) "
-                             "since it is a multiple of the miimon value.\n",
-                             bond->dev->name,
-                             bond->params.updelay * bond->params.miimon);
+                       pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
+                               bond->dev->name,
+                               bond->params.updelay * bond->params.miimon);
                if (bond->params.downdelay)
-                       pr_info(DRV_NAME
-                             ": %s: Note: Updating downdelay (to %d) "
-                             "since it is a multiple of the miimon value.\n",
-                             bond->dev->name,
-                             bond->params.downdelay * bond->params.miimon);
+                       pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
+                               bond->dev->name,
+                               bond->params.downdelay * bond->params.miimon);
                if (bond->params.arp_interval) {
-                       pr_info(DRV_NAME
-                              ": %s: MII monitoring cannot be used with "
-                              "ARP monitoring. Disabling ARP monitoring...\n",
-                              bond->dev->name);
+                       pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
+                               bond->dev->name);
                        bond->params.arp_interval = 0;
                        bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                        if (bond->params.arp_validate) {
@@ -1176,17 +1115,15 @@ static ssize_t bonding_store_primary(struct device *d,
        write_lock_bh(&bond->curr_slave_lock);
 
        if (!USES_PRIMARY(bond->params.mode)) {
-               pr_info(DRV_NAME
-                      ": %s: Unable to set primary slave; %s is in mode %d\n",
-                      bond->dev->name, bond->dev->name, bond->params.mode);
+               pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
+                       bond->dev->name, bond->dev->name, bond->params.mode);
        } else {
                bond_for_each_slave(bond, slave, i) {
                        if (strnicmp
                            (slave->dev->name, buf,
                             strlen(slave->dev->name)) == 0) {
-                               pr_info(DRV_NAME
-                                      ": %s: Setting %s as primary slave.\n",
-                                      bond->dev->name, slave->dev->name);
+                               pr_info("%s: Setting %s as primary slave.\n",
+                                       bond->dev->name, slave->dev->name);
                                bond->primary_slave = slave;
                                strcpy(bond->params.primary, slave->dev->name);
                                bond_select_active_slave(bond);
@@ -1197,15 +1134,13 @@ static ssize_t bonding_store_primary(struct device *d,
                /* if we got here, then we didn't match the name of any slave */
 
                if (strlen(buf) == 0 || buf[0] == '\n') {
-                       pr_info(DRV_NAME
-                              ": %s: Setting primary slave to None.\n",
-                              bond->dev->name);
+                       pr_info("%s: Setting primary slave to None.\n",
+                               bond->dev->name);
                        bond->primary_slave = NULL;
                                bond_select_active_slave(bond);
                } else {
-                       pr_info(DRV_NAME
-                              ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
-                              bond->dev->name, (int)strlen(buf) - 1, buf);
+                       pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                               bond->dev->name, (int)strlen(buf) - 1, buf);
                }
        }
 out:
@@ -1244,8 +1179,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
 
        new_value = bond_parse_parm(buf, pri_reselect_tbl);
        if (new_value < 0)  {
-               pr_err(DRV_NAME
-                      ": %s: Ignoring invalid primary_reselect value %.*s.\n",
+               pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
                       bond->dev->name,
                       (int) strlen(buf) - 1, buf);
                ret = -EINVAL;
@@ -1253,7 +1187,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
        }
 
        bond->params.primary_reselect = new_value;
-       pr_info(DRV_NAME ": %s: setting primary_reselect to %s (%d).\n",
+       pr_info("%s: setting primary_reselect to %s (%d).\n",
                bond->dev->name, pri_reselect_tbl[new_value].modename,
                new_value);
 
@@ -1291,20 +1225,18 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
        if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err(DRV_NAME
-                      ": %s: no use_carrier value specified.\n",
+               pr_err("%s: no use_carrier value specified.\n",
                       bond->dev->name);
                ret = -EINVAL;
                goto out;
        }
        if ((new_value == 0) || (new_value == 1)) {
                bond->params.use_carrier = new_value;
-               pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Setting use_carrier to %d.\n",
+                       bond->dev->name, new_value);
        } else {
-               pr_info(DRV_NAME
-                      ": %s: Ignoring invalid use_carrier value %d.\n",
-                      bond->dev->name, new_value);
+               pr_info("%s: Ignoring invalid use_carrier value %d.\n",
+                       bond->dev->name, new_value);
        }
 out:
        return count;
@@ -1349,8 +1281,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
        write_lock_bh(&bond->curr_slave_lock);
 
        if (!USES_PRIMARY(bond->params.mode))
-               pr_info(DRV_NAME ": %s: Unable to change active slave;"
-                       " %s is in mode %d\n",
+               pr_info("%s: Unable to change active slave; %s is in mode %d\n",
                        bond->dev->name, bond->dev->name, bond->params.mode);
        else {
                bond_for_each_slave(bond, slave, i) {
@@ -1361,9 +1292,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                new_active = slave;
                                if (new_active == old_active) {
                                        /* do nothing */
-                                       pr_info(DRV_NAME
-                                               ": %s: %s is already the current active slave.\n",
-                                               bond->dev->name, slave->dev->name);
+                                       pr_info("%s: %s is already the current active slave.\n",
+                                               bond->dev->name,
+                                               slave->dev->name);
                                        goto out;
                                }
                                else {
@@ -1371,16 +1302,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                            (old_active) &&
                                            (new_active->link == BOND_LINK_UP) &&
                                            IS_UP(new_active->dev)) {
-                                               pr_info(DRV_NAME
-                                                       ": %s: Setting %s as active slave.\n",
-                                                       bond->dev->name, slave->dev->name);
+                                               pr_info("%s: Setting %s as active slave.\n",
+                                                       bond->dev->name,
+                                                       slave->dev->name);
                                                        bond_change_active_slave(bond, new_active);
                                        }
                                        else {
-                                               pr_info(DRV_NAME
-                                                       ": %s: Could not set %s as active slave; "
-                                                       "either %s is down or the link is down.\n",
-                                                       bond->dev->name, slave->dev->name,
+                                               pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
+                                                       bond->dev->name,
+                                                       slave->dev->name,
                                                        slave->dev->name);
                                        }
                                        goto out;
@@ -1391,14 +1321,12 @@ static ssize_t bonding_store_active_slave(struct device *d,
                /* if we got here, then we didn't match the name of any slave */
 
                if (strlen(buf) == 0 || buf[0] == '\n') {
-                       pr_info(DRV_NAME
-                               ": %s: Setting active slave to None.\n",
+                       pr_info("%s: Setting active slave to None.\n",
                                bond->dev->name);
                        bond->primary_slave = NULL;
                        bond_select_active_slave(bond);
                } else {
-                       pr_info(DRV_NAME ": %s: Unable to set %.*s"
-                               " as active slave as it is not a slave.\n",
+                       pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
                                bond->dev->name, (int)strlen(buf) - 1, buf);
                }
        }
@@ -1600,8 +1528,7 @@ int bond_create_sysfs(void)
                /* Is someone being kinky and naming a device bonding_master? */
                if (__dev_get_by_name(&init_net,
                                      class_attr_bonding_masters.attr.name))
-                       pr_err("network device named %s already "
-                              "exists in sysfs",
+                       pr_err("network device named %s already exists in sysfs",
                               class_attr_bonding_masters.attr.name);
                ret = 0;
        }
index 8c485aad1b94007ca98ff8cc6db39ba2f19f44f8..05b751719bd5dd4634b7a1234291cc764fbd82ec 100644 (file)
@@ -50,7 +50,7 @@ config CAN_TI_HECC
 
 config CAN_MCP251X
        tristate "Microchip MCP251x SPI CAN controllers"
-       depends on CAN_DEV && SPI
+       depends on CAN_DEV && SPI && HAS_DMA
        ---help---
          Driver for the Microchip MCP251x SPI CAN controllers.
 
index cbe3fce53e3b108df0be08b4e96929438289516e..d0ec17878ffc0ff80df1a55a34f2558c30bc8540 100644 (file)
@@ -474,7 +474,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
        reg_msr = at91_read(priv, AT91_MSR(mb));
        if (reg_msr & AT91_MSR_MRTR)
                cf->can_id |= CAN_RTR_FLAG;
-       cf->can_dlc = min_t(__u8, (reg_msr >> 16) & 0xf, 8);
+       cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
 
        *(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
        *(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
index c7fc1de28173527157711881666067fc20cb996b..0ec1524523ccaa939988d3d0c1f55bcd3450114f 100644 (file)
@@ -392,7 +392,7 @@ static void bfin_can_rx(struct net_device *dev, u16 isrc)
                cf->can_id |= CAN_RTR_FLAG;
 
        /* get data length code */
-       cf->can_dlc = bfin_read16(&reg->chl[obj].dlc);
+       cf->can_dlc = get_can_dlc(bfin_read16(&reg->chl[obj].dlc) & 0xF);
 
        /* get payload */
        for (i = 0; i < 8; i += 2) {
index 78b1b69b29211d8dc6a0d365839b22e191bcb215..9c5a1537939ce5c5ce4a3f6950686c66389ea1a3 100644 (file)
@@ -403,9 +403,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
 
                for (i = 1; i < RXBDAT_OFF; i++)
                        buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
-               len = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-               if (len > 8)
-                       len = 8;
+
+               len = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
                for (; i < (RXBDAT_OFF + len); i++)
                        buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
        } else {
@@ -455,13 +454,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
                        (buf[RXBSIDL_OFF] >> RXBSIDL_SHIFT);
        }
        /* Data length */
-       frame->can_dlc = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-       if (frame->can_dlc > 8) {
-               dev_warn(&spi->dev, "invalid frame recevied\n");
-               priv->net->stats.rx_errors++;
-               dev_kfree_skb(skb);
-               return;
-       }
+       frame->can_dlc = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
        memcpy(frame->data, buf + RXBDAT_OFF, frame->can_dlc);
 
        priv->net->stats.rx_packets++;
index bb06dfb58f2541bb60fff71e84ff2d7042f78cfd..07346f880ca680e49668f7dc783bf734b5dbd157 100644 (file)
@@ -297,7 +297,8 @@ static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
        frame->can_id |= can_id >> 1;
        if (can_id & 1)
                frame->can_id |= CAN_RTR_FLAG;
-       frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
+
+       frame->can_dlc = get_can_dlc(in_8(&regs->rx.dlr) & 0xf);
 
        if (!(frame->can_id & CAN_RTR_FLAG)) {
                void __iomem *data = &regs->rx.dsr1_0;
index b4ba88a3107571b65c53ecdae9011b7f6bd8a1c1..542a4f7255b4f5db367ef755abb623aed752c9b1 100644 (file)
@@ -293,15 +293,14 @@ static void sja1000_rx(struct net_device *dev)
        uint8_t fi;
        uint8_t dreg;
        canid_t id;
-       uint8_t dlc;
        int i;
 
+       /* create zero'ed CAN frame buffer */
        skb = alloc_can_skb(dev, &cf);
        if (skb == NULL)
                return;
 
        fi = priv->read_reg(priv, REG_FI);
-       dlc = fi & 0x0F;
 
        if (fi & FI_FF) {
                /* extended frame format (EFF) */
@@ -318,16 +317,15 @@ static void sja1000_rx(struct net_device *dev)
                    | (priv->read_reg(priv, REG_ID2) >> 5);
        }
 
-       if (fi & FI_RTR)
+       if (fi & FI_RTR) {
                id |= CAN_RTR_FLAG;
+       } else {
+               cf->can_dlc = get_can_dlc(fi & 0x0F);
+               for (i = 0; i < cf->can_dlc; i++)
+                       cf->data[i] = priv->read_reg(priv, dreg++);
+       }
 
        cf->can_id = id;
-       cf->can_dlc = dlc;
-       for (i = 0; i < dlc; i++)
-               cf->data[i] = priv->read_reg(priv, dreg++);
-
-       while (i < 8)
-               cf->data[i++] = 0;
 
        /* release receive buffer */
        priv->write_reg(priv, REG_CMR, CMD_RRB);
@@ -335,7 +333,7 @@ static void sja1000_rx(struct net_device *dev)
        netif_rx(skb);
 
        stats->rx_packets++;
-       stats->rx_bytes += dlc;
+       stats->rx_bytes += cf->can_dlc;
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
index 07e8016b17eca24f79e9e862f73d5f85e8ce4e94..5c993c2da5281b24c74434ad54ccb0862fa9bc72 100644 (file)
@@ -552,7 +552,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
        data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
        if (data & HECC_CANMCF_RTR)
                cf->can_id |= CAN_RTR_FLAG;
-       cf->can_dlc = data & 0xF;
+       cf->can_dlc = get_can_dlc(data & 0xF);
        data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
        *(u32 *)(cf->data) = cpu_to_be32(data);
        if (cf->can_dlc > 4) {
index 591eb0eb1c2bdcc5ec147173a41829bd497c093b..efbb05c71bf47fdde6af69fb13d1a38fdd80f032 100644 (file)
@@ -316,7 +316,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
                return;
 
        cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
-       cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
+       cf->can_dlc = get_can_dlc(msg->msg.can_msg.length & 0xF);
 
        if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
            msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
index 678222389407b91ba0073780e18c7c04c10dde4a..8d0be26f94e3b61229721d7e8d95529d929549f7 100644 (file)
@@ -1163,7 +1163,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
        priv->dev = dev;
        priv->ring_size = 64;
        priv->msg_enable = netif_msg_init(debug_level, 0xff);
-       memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
+       memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
 
        snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
 
index e2d5343f127553d7ad7c5d4b032bd087f66db990..204177d78cecfc1479ae867d0e40709ec2297ec1 100644 (file)
@@ -509,6 +509,40 @@ static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
        return status;
 }
 
+/**
+ *  ixgbe_validate_link_ready - Function looks for phy link
+ *  @hw: pointer to hardware structure
+ *
+ *  Function indicates success when phy link is available. If phy is not ready
+ *  within 5 seconds of MAC indicating link, the function returns error.
+ **/
+static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
+{
+       u32 timeout;
+       u16 an_reg;
+
+       if (hw->device_id != IXGBE_DEV_ID_82598AT2)
+               return 0;
+
+       for (timeout = 0;
+            timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
+               hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
+
+               if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
+                   (an_reg & MDIO_STAT1_LSTATUS))
+                       break;
+
+               msleep(100);
+       }
+
+       if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
+               hw_dbg(hw, "Link was indicated but link is down\n");
+               return IXGBE_ERR_LINK_SETUP;
+       }
+
+       return 0;
+}
+
 /**
  *  ixgbe_check_mac_link_82598 - Get link/speed status
  *  @hw: pointer to hardware structure
@@ -589,6 +623,10 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
        else
                *speed = IXGBE_LINK_SPEED_1GB_FULL;
 
+       if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
+           (ixgbe_validate_link_ready(hw) != 0))
+               *link_up = false;
+
        /* if link is down, zero out the current_mode */
        if (*link_up == false) {
                hw->fc.current_mode = ixgbe_fc_none;
index 35ea8c93fd809b082c78e035aaa2b7c31966bd0c..bd64387563f040311ae5bafb207bf7f51f094cfe 100644 (file)
@@ -4511,6 +4511,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
        struct ixgbe_hw *hw = &adapter->hw;
        u64 total_mpc = 0;
        u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
+       u64 non_eop_descs = 0, restart_queue = 0;
 
        if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                u64 rsc_count = 0;
@@ -4528,10 +4529,12 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 
        /* gather some stats to the adapter struct that are per queue */
        for (i = 0; i < adapter->num_tx_queues; i++)
-               adapter->restart_queue += adapter->tx_ring[i].restart_queue;
+               restart_queue += adapter->tx_ring[i].restart_queue;
+       adapter->restart_queue = restart_queue;
 
        for (i = 0; i < adapter->num_rx_queues; i++)
-               adapter->non_eop_descs += adapter->tx_ring[i].non_eop_descs;
+               non_eop_descs += adapter->rx_ring[i].non_eop_descs;
+       adapter->non_eop_descs = non_eop_descs;
 
        adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
        for (i = 0; i < 8; i++) {
@@ -5003,7 +5006,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                    IXGBE_ADVTXD_DTYP_CTXT);
 
                if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       switch (skb->protocol) {
+                       __be16 protocol;
+
+                       if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
+                               const struct vlan_ethhdr *vhdr =
+                                       (const struct vlan_ethhdr *)skb->data;
+
+                               protocol = vhdr->h_vlan_encapsulated_proto;
+                       } else {
+                               protocol = skb->protocol;
+                       }
+
+                       switch (protocol) {
                        case cpu_to_be16(ETH_P_IP):
                                type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
                                if (ip_hdr(skb)->protocol == IPPROTO_TCP)
index f3e8d52610b7d57960dbbe835cdb7845ed05dc2f..84650c6ebe038bcfbebf872b1c56c4804ec50680 100644 (file)
 #define IXGBE_MPVC      0x04318
 #define IXGBE_SGMIIC    0x04314
 
+#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
+
 /* Omer CORECTL */
 #define IXGBE_CORECTL           0x014F00
 /* BARCTRL */
index f36ae691cab3c343091fb7130591c8737ab4afee..015fbe785c13304aab333759a4629250b531b8d9 100644 (file)
@@ -53,7 +53,7 @@ static int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
 
        if (out_param > 2) {
                mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
-               return EINVAL;
+               return -EINVAL;
        }
 
        *type = out_param;
index 17a27225cc98cbc076f705ec6c850812ed6f56c8..98938ea9e0bdc05bb7c3f5e18d83ef535e844869 100644 (file)
@@ -912,7 +912,11 @@ static void media_check(unsigned long arg)
        if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
                if (!lp->fast_poll)
                        printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
+
+               local_irq_save(flags);
                el3_interrupt(dev->irq, dev);
+               local_irq_restore(flags);
+
                lp->fast_poll = HZ;
        }
        if (lp->fast_poll) {
index 6f8d7e2e592246205df9ae45625ae1816e9f03b3..322e11df0097f1f04204fd6a09d6a892273b1965 100644 (file)
@@ -711,7 +711,11 @@ static void media_check(unsigned long arg)
        (inb(ioaddr + EL3_TIMER) == 0xff)) {
        if (!lp->fast_poll)
            printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
+
+       local_irq_save(flags);
        el3_interrupt(dev->irq, dev);
+       local_irq_restore(flags);
+
        lp->fast_poll = HZ;
     }
     if (lp->fast_poll) {
index 14949bb303a0bca7e87d4fea48e6e4f69d6eca0c..af3933579790f8aacc4302f193729552efea4fb2 100644 (file)
@@ -47,7 +47,7 @@ static const unsigned char payload_source[ETH_ALEN] = {
        0x00, 0x0f, 0x53, 0x1b, 0x1b, 0x1b,
 };
 
-static const char *payload_msg =
+static const char payload_msg[] =
        "Hello world! This is an Efx loopback test in progress!";
 
 /**
index c88bc1013047573b9945658970ffd06b082389f0..ca6285016dfd633633c70605c296e703f40c5ee7 100644 (file)
@@ -84,6 +84,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .mpr            = 1,
        .tpauser        = 1,
        .hw_swap        = 1,
+       .rpadir         = 1,
+       .rpadir_value   = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
 };
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
@@ -175,7 +177,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .tpauser        = 1,
        .bculr          = 1,
        .hw_swap        = 1,
-       .rpadir         = 1,
        .no_trimd       = 1,
        .no_ade         = 1,
 };
@@ -501,6 +502,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
         */
        mdp->rx_buf_sz = (ndev->mtu <= 1492 ? PKT_BUF_SZ :
                          (((ndev->mtu + 26 + 7) & ~7) + 2 + 16));
+       if (mdp->cd->rpadir)
+               mdp->rx_buf_sz += NET_IP_ALIGN;
 
        /* Allocate RX and TX skb rings */
        mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * RX_RING_SIZE,
@@ -715,6 +718,8 @@ static int sh_eth_rx(struct net_device *ndev)
                                        pkt_len + 2);
                        skb = mdp->rx_skbuff[entry];
                        mdp->rx_skbuff[entry] = NULL;
+                       if (mdp->cd->rpadir)
+                               skb_reserve(skb, NET_IP_ALIGN);
                        skb_put(skb, pkt_len);
                        skb->protocol = eth_type_trans(skb, ndev);
                        netif_rx(skb);
index 89a05d674ddca5c1acc6748fe2774299f5cc2b95..1c01b96c9611220554a10385e447f579ad36e133 100644 (file)
@@ -644,7 +644,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
 {
        u32 reg1;
 
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
        reg1 &= ~phy_power[port];
 
@@ -652,7 +651,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
                reg1 |= coma_mode[port];
 
        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
        sky2_pci_read32(hw, PCI_DEV_REG1);
 
        if (hw->chip_id == CHIP_ID_YUKON_FE)
@@ -709,11 +707,9 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
                gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_PDOWN);
        }
 
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
        reg1 |= phy_power[port];                /* set PHY to PowerDown/COMA Mode */
        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 /* Force a renegotiation */
@@ -2152,9 +2148,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)
 
        /* reset PHY Link Detect */
        phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
        sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
        sky2_link_up(sky2);
 }
@@ -2645,7 +2639,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
        if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                u16 pci_err;
 
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                pci_err = sky2_pci_read16(hw, PCI_STATUS);
                if (net_ratelimit())
                        dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
@@ -2653,14 +2646,12 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                sky2_pci_write16(hw, PCI_STATUS,
                                      pci_err | PCI_STATUS_ERROR_BITS);
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
        }
 
        if (status & Y2_IS_PCI_EXP) {
                /* PCI-Express uncorrectable Error occurred */
                u32 err;
 
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
                sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
                             0xfffffffful);
@@ -2668,7 +2659,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                        dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
                sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
        }
 
        if (status & Y2_HWE_L1_MASK)
@@ -3047,7 +3037,6 @@ static void sky2_reset(struct sky2_hw *hw)
        }
 
        sky2_power_on(hw);
-       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
        for (i = 0; i < hw->ports; i++) {
                sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -3084,7 +3073,6 @@ static void sky2_reset(struct sky2_hw *hw)
                reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
 
                /* reset PHY Link Detect */
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                sky2_pci_write16(hw, PSM_CONFIG_REG4,
                                 reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
                sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3102,7 +3090,6 @@ static void sky2_reset(struct sky2_hw *hw)
                        /* restore the PCIe Link Control register */
                        sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
                }
-               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
                sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));
@@ -4530,7 +4517,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                "Optima",       /* 0xbc */
        };
 
-       if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT)
+       if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT)
                strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
        else
                snprintf(buf, sz, "(chip %#x)", chipid);
index b091e20ca1679d82544751a5aa39683b69d244ac..f14d225404da59c5b5ce84b6e3849663e799aca1 100644 (file)
@@ -324,7 +324,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
                dbg("%02X:", netdev->dev_addr[i]);
        dbg("%02X\n", netdev->dev_addr[i]);
        /* Set the IDR registers. */
-       set_registers(dev, IDR, sizeof(netdev->dev_addr), netdev->dev_addr);
+       set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
 #ifdef EEPROM_WRITE
        {
        u8 cr;
index 1ed2a5cc03f5fb00dca89368b0d72cd42b85acf9..3db7767d2a175b9caf61ec4d98de415f7c24f6b6 100644 (file)
@@ -51,6 +51,15 @@ struct can_priv {
        struct sk_buff **echo_skb;
 };
 
+/*
+ * get_can_dlc(value) - helper macro to cast a given data length code (dlc)
+ * to __u8 and ensure the dlc value to be max. 8 bytes.
+ *
+ * To be used in the CAN netdriver receive path to ensure conformance with
+ * ISO 11898-1 Chapter 8.4.2.3 (DLC field)
+ */
+#define get_can_dlc(i) (min_t(__u8, (i), 8))
+
 struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 
index 14fc906ed6029edc67f93bd60b6ba3052c45bb29..05330fc5b436034aa1b361934e2180bd96266938 100644 (file)
@@ -368,11 +368,9 @@ enum {
 #define RTAX_MAX (__RTAX_MAX - 1)
 
 #define RTAX_FEATURE_ECN       0x00000001
-#define RTAX_FEATURE_NO_SACK   0x00000002
-#define RTAX_FEATURE_NO_TSTAMP 0x00000004
+#define RTAX_FEATURE_SACK      0x00000002
+#define RTAX_FEATURE_TIMESTAMP 0x00000004
 #define RTAX_FEATURE_ALLFRAG   0x00000008
-#define RTAX_FEATURE_NO_WSCALE 0x00000010
-#define RTAX_FEATURE_NO_DSACK  0x00000020
 
 struct rta_session {
        __u8    proto;
index 387cb3cfde7ece63c4b8626ba3beb30ab526444d..39c4a5963e12a8cece4cd7c4d2bd9a8ee192361d 100644 (file)
@@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
 static inline u32
 dst_feature(const struct dst_entry *dst, u32 feature)
 {
-       return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+       return dst_metric(dst, RTAX_FEATURES) & feature;
 }
 
 static inline u32 dst_mtu(const struct dst_entry *dst)
index e6b9d12d5f620ba939a814c14d8c25ce53aed569..85108cfbb1ae85e09bc762f29665545d87b1a5db 100644 (file)
@@ -337,6 +337,7 @@ enum ip_defrag_users {
        IP_DEFRAG_CALL_RA_CHAIN,
        IP_DEFRAG_CONNTRACK_IN,
        IP_DEFRAG_CONNTRACK_OUT,
+       IP_DEFRAG_CONNTRACK_BRIDGE_IN,
        IP_DEFRAG_VS_IN,
        IP_DEFRAG_VS_OUT,
        IP_DEFRAG_VS_FWD
index 92db8617d18842092c8ee635b33e35cfecba33d9..ccab5946c830da21409190aac9b854f0f905264a 100644 (file)
@@ -350,8 +350,16 @@ static inline int ipv6_prefix_equal(const struct in6_addr *a1,
 
 struct inet_frag_queue;
 
+enum ip6_defrag_users {
+       IP6_DEFRAG_LOCAL_DELIVER,
+       IP6_DEFRAG_CONNTRACK_IN,
+       IP6_DEFRAG_CONNTRACK_OUT,
+       IP6_DEFRAG_CONNTRACK_BRIDGE_IN,
+};
+
 struct ip6_create_arg {
        __be32 id;
+       u32 user;
        struct in6_addr *src;
        struct in6_addr *dst;
 };
index abc55ad75c2b849b1b22e036275133785588c151..1ee717eb5b099f6fa1fc782506c05e0dd59addb8 100644 (file)
@@ -9,7 +9,7 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
 
 extern int nf_ct_frag6_init(void);
 extern void nf_ct_frag6_cleanup(void);
-extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb);
+extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);
 extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
                               struct net_device *in,
                               struct net_device *out,
index 1b6f7d348ceed85dac011ccfc8bc7f0a1dfee1cb..34f5cc24d903332f9c29f2cb0484ade46dad0f54 100644 (file)
@@ -408,8 +408,7 @@ extern int                  tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
 extern void                    tcp_parse_options(struct sk_buff *skb,
                                                  struct tcp_options_received *opt_rx,
                                                  u8 **hvpp,
-                                                 int estab,
-                                                 struct dst_entry *dst);
+                                                 int estab);
 
 extern u8                      *tcp_parse_md5sig_option(struct tcphdr *th);
 
index 6fe7d739e59bdf1fc4ebe10f427b7c3d0d8308ec..be9924f60ec34bafa135916455595e794a7fe86c 100644 (file)
@@ -5035,6 +5035,11 @@ int register_netdevice(struct net_device *dev)
                rollback_registered(dev);
                dev->reg_state = NETREG_UNREGISTERED;
        }
+       /*
+        *      Prevent userspace races by waiting until the network
+        *      device is fully setup before sending notifications.
+        */
+       rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
 
 out:
        return ret;
@@ -5597,6 +5602,12 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
        /* Notify protocols, that a new device appeared. */
        call_netdevice_notifiers(NETDEV_REGISTER, dev);
 
+       /*
+        *      Prevent userspace races by waiting until the network
+        *      device is fully setup before sending notifications.
+        */
+       rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
+
        synchronize_net();
        err = 0;
 out:
index 33148a568199c7215b87e63f68a39b4a02afb4cd..794bcb897ff000eeff119df41e72864958b304d3 100644 (file)
@@ -1364,15 +1364,15 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
        case NETDEV_UNREGISTER:
                rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
                break;
-       case NETDEV_REGISTER:
-               rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
-               break;
        case NETDEV_UP:
        case NETDEV_DOWN:
                rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
                break;
+       case NETDEV_POST_INIT:
+       case NETDEV_REGISTER:
        case NETDEV_CHANGE:
        case NETDEV_GOING_DOWN:
+       case NETDEV_UNREGISTER_BATCH:
                break;
        default:
                rtmsg_ifinfo(RTM_NEWLINK, dev, 0);
index fa2d6b6fc3e581524181d88a1402df6289eb42c8..331ead3ebd1be98c93ec5bd15cfcb68171c080a7 100644 (file)
@@ -14,6 +14,7 @@
 #include <net/route.h>
 #include <net/ip.h>
 
+#include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv4.h>
 #include <net/netfilter/ipv4/nf_defrag_ipv4.h>
 
@@ -34,6 +35,20 @@ static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)
        return err;
 }
 
+static enum ip_defrag_users nf_ct_defrag_user(unsigned int hooknum,
+                                             struct sk_buff *skb)
+{
+#ifdef CONFIG_BRIDGE_NETFILTER
+       if (skb->nf_bridge &&
+           skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)
+               return IP_DEFRAG_CONNTRACK_BRIDGE_IN;
+#endif
+       if (hooknum == NF_INET_PRE_ROUTING)
+               return IP_DEFRAG_CONNTRACK_IN;
+       else
+               return IP_DEFRAG_CONNTRACK_OUT;
+}
+
 static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
                                          struct sk_buff *skb,
                                          const struct net_device *in,
@@ -50,10 +65,8 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
 #endif
        /* Gather fragments. */
        if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
-               if (nf_ct_ipv4_gather_frags(skb,
-                                           hooknum == NF_INET_PRE_ROUTING ?
-                                           IP_DEFRAG_CONNTRACK_IN :
-                                           IP_DEFRAG_CONNTRACK_OUT))
+               enum ip_defrag_users user = nf_ct_defrag_user(hooknum, skb);
+               if (nf_ct_ipv4_gather_frags(skb, user))
                        return NF_STOLEN;
        }
        return NF_ACCEPT;
index 26399ad2a289ba199f8a9df086d0ef5c62635af6..66fd80ef247337d03f84fd264aab748f60346297 100644 (file)
@@ -277,6 +277,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
 
        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+       /* check for timestamp cookie support */
+       memset(&tcp_opt, 0, sizeof(tcp_opt));
+       tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+       if (tcp_opt.saw_tstamp)
+               cookie_check_timestamp(&tcp_opt);
+
        ret = NULL;
        req = inet_reqsk_alloc(&tcp_request_sock_ops); /* for safety */
        if (!req)
@@ -292,6 +299,12 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
        ireq->loc_addr          = ip_hdr(skb)->daddr;
        ireq->rmt_addr          = ip_hdr(skb)->saddr;
        ireq->ecn_ok            = 0;
+       ireq->snd_wscale        = tcp_opt.snd_wscale;
+       ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+       ireq->sack_ok           = tcp_opt.sack_ok;
+       ireq->wscale_ok         = tcp_opt.wscale_ok;
+       ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+       req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
 
        /* We throwed the options of the initial SYN away, so we hope
         * the ACK carries the same options again (see RFC1122 4.2.3.8)
@@ -340,20 +353,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
                }
        }
 
-       /* check for timestamp cookie support */
-       memset(&tcp_opt, 0, sizeof(tcp_opt));
-       tcp_parse_options(skb, &tcp_opt, &hash_location, 0, &rt->u.dst);
-
-       if (tcp_opt.saw_tstamp)
-               cookie_check_timestamp(&tcp_opt);
-
-       ireq->snd_wscale        = tcp_opt.snd_wscale;
-       ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-       ireq->sack_ok           = tcp_opt.sack_ok;
-       ireq->wscale_ok         = tcp_opt.wscale_ok;
-       ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-       req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
        /* Try to redo what tcp_v4_send_synack did. */
        req->window_clamp = tp->window_clamp ? :dst_metric(&rt->u.dst, RTAX_WINDOW);
 
index 12cab7d74dba2a5ecacf226256da5e7fa60910a2..28e029632493629ca409b02d094c18de56279eaf 100644 (file)
@@ -3727,7 +3727,7 @@ old_ack:
  * the fast version below fails.
  */
 void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
-                      u8 **hvpp, int estab,  struct dst_entry *dst)
+                      u8 **hvpp, int estab)
 {
        unsigned char *ptr;
        struct tcphdr *th = tcp_hdr(skb);
@@ -3766,8 +3766,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                break;
                        case TCPOPT_WINDOW:
                                if (opsize == TCPOLEN_WINDOW && th->syn &&
-                                   !estab && sysctl_tcp_window_scaling &&
-                                   !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)) {
+                                   !estab && sysctl_tcp_window_scaling) {
                                        __u8 snd_wscale = *(__u8 *)ptr;
                                        opt_rx->wscale_ok = 1;
                                        if (snd_wscale > 14) {
@@ -3783,8 +3782,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                        case TCPOPT_TIMESTAMP:
                                if ((opsize == TCPOLEN_TIMESTAMP) &&
                                    ((estab && opt_rx->tstamp_ok) ||
-                                    (!estab && sysctl_tcp_timestamps &&
-                                     !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP)))) {
+                                    (!estab && sysctl_tcp_timestamps))) {
                                        opt_rx->saw_tstamp = 1;
                                        opt_rx->rcv_tsval = get_unaligned_be32(ptr);
                                        opt_rx->rcv_tsecr = get_unaligned_be32(ptr + 4);
@@ -3792,8 +3790,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                break;
                        case TCPOPT_SACK_PERM:
                                if (opsize == TCPOLEN_SACK_PERM && th->syn &&
-                                   !estab && sysctl_tcp_sack &&
-                                   !dst_feature(dst, RTAX_FEATURE_NO_SACK)) {
+                                   !estab && sysctl_tcp_sack) {
                                        opt_rx->sack_ok = 1;
                                        tcp_sack_reset(opt_rx);
                                }
@@ -3878,7 +3875,7 @@ static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th,
                if (tcp_parse_aligned_timestamp(tp, th))
                        return 1;
        }
-       tcp_parse_options(skb, &tp->rx_opt, hvpp, 1, NULL);
+       tcp_parse_options(skb, &tp->rx_opt, hvpp, 1);
        return 1;
 }
 
@@ -4133,10 +4130,8 @@ static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq,
 static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq)
 {
        struct tcp_sock *tp = tcp_sk(sk);
-       struct dst_entry *dst = __sk_dst_get(sk);
 
-       if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-           !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+       if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                int mib_idx;
 
                if (before(seq, tp->rcv_nxt))
@@ -4165,15 +4160,13 @@ static void tcp_dsack_extend(struct sock *sk, u32 seq, u32 end_seq)
 static void tcp_send_dupack(struct sock *sk, struct sk_buff *skb)
 {
        struct tcp_sock *tp = tcp_sk(sk);
-       struct dst_entry *dst = __sk_dst_get(sk);
 
        if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq &&
            before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);
                tcp_enter_quickack_mode(sk);
 
-               if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+               if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                        u32 end_seq = TCP_SKB_CB(skb)->end_seq;
 
                        if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))
@@ -5428,11 +5421,10 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
        u8 *hash_location;
        struct inet_connection_sock *icsk = inet_csk(sk);
        struct tcp_sock *tp = tcp_sk(sk);
-       struct dst_entry *dst = __sk_dst_get(sk);
        struct tcp_cookie_values *cvp = tp->cookie_values;
        int saved_clamp = tp->rx_opt.mss_clamp;
 
-       tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0, dst);
+       tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
 
        if (th->ack) {
                /* rfc793:
index 15e96030ce47d16fdd1095807d7b8283a02d1215..65b8ebfd078a35e909c7cbf0c4e1c7bda594ac2f 100644 (file)
@@ -1262,20 +1262,10 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        tcp_rsk(req)->af_specific = &tcp_request_sock_ipv4_ops;
 #endif
 
-       ireq = inet_rsk(req);
-       ireq->loc_addr = daddr;
-       ireq->rmt_addr = saddr;
-       ireq->no_srccheck = inet_sk(sk)->transparent;
-       ireq->opt = tcp_v4_save_options(sk, skb);
-
-       dst = inet_csk_route_req(sk, req);
-       if(!dst)
-               goto drop_and_free;
-
        tcp_clear_options(&tmp_opt);
        tmp_opt.mss_clamp = TCP_MSS_DEFAULT;
        tmp_opt.user_mss  = tp->rx_opt.user_mss;
-       tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+       tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
        if (tmp_opt.cookie_plus > 0 &&
            tmp_opt.saw_tstamp &&
@@ -1319,8 +1309,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
        tcp_openreq_init(req, &tmp_opt, skb);
 
+       ireq = inet_rsk(req);
+       ireq->loc_addr = daddr;
+       ireq->rmt_addr = saddr;
+       ireq->no_srccheck = inet_sk(sk)->transparent;
+       ireq->opt = tcp_v4_save_options(sk, skb);
+
        if (security_inet_conn_request(sk, skb, req))
-               goto drop_and_release;
+               goto drop_and_free;
 
        if (!want_cookie)
                TCP_ECN_create_request(req, tcp_hdr(skb));
@@ -1345,6 +1341,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                 */
                if (tmp_opt.saw_tstamp &&
                    tcp_death_row.sysctl_tw_recycle &&
+                   (dst = inet_csk_route_req(sk, req)) != NULL &&
                    (peer = rt_get_peer((struct rtable *)dst)) != NULL &&
                    peer->v4daddr == saddr) {
                        if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&
index 87accec8d09727f0914a5f67c4cf3018a7c46738..f206ee5dda80b4e8c29f6576276bb1452e09c53e 100644 (file)
@@ -95,9 +95,9 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
        struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
        int paws_reject = 0;
 
+       tmp_opt.saw_tstamp = 0;
        if (th->doff > (sizeof(*th) >> 2) && tcptw->tw_ts_recent_stamp) {
-               tmp_opt.tstamp_ok = 1;
-               tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+               tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                if (tmp_opt.saw_tstamp) {
                        tmp_opt.ts_recent       = tcptw->tw_ts_recent;
@@ -526,9 +526,9 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
        __be32 flg = tcp_flag_word(th) & (TCP_FLAG_RST|TCP_FLAG_SYN|TCP_FLAG_ACK);
        int paws_reject = 0;
 
-       if ((th->doff > (sizeof(*th) >> 2)) && (req->ts_recent)) {
-               tmp_opt.tstamp_ok = 1;
-               tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+       tmp_opt.saw_tstamp = 0;
+       if (th->doff > (sizeof(struct tcphdr)>>2)) {
+               tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                if (tmp_opt.saw_tstamp) {
                        tmp_opt.ts_recent = req->ts_recent;
index 93316a96d820f5afc16984af390b2460e1b37904..383ce237640fdb8b2d79d205fd8cb8a7f123ee7f 100644 (file)
@@ -553,7 +553,6 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
                                struct tcp_md5sig_key **md5) {
        struct tcp_sock *tp = tcp_sk(sk);
        struct tcp_cookie_values *cvp = tp->cookie_values;
-       struct dst_entry *dst = __sk_dst_get(sk);
        unsigned remaining = MAX_TCP_OPTION_SPACE;
        u8 cookie_size = (!tp->rx_opt.cookie_out_never && cvp != NULL) ?
                         tcp_cookie_size_check(cvp->cookie_desired) :
@@ -581,22 +580,18 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
        opts->mss = tcp_advertise_mss(sk);
        remaining -= TCPOLEN_MSS_ALIGNED;
 
-       if (likely(sysctl_tcp_timestamps &&
-                  !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) &&
-                  *md5 == NULL)) {
+       if (likely(sysctl_tcp_timestamps && *md5 == NULL)) {
                opts->options |= OPTION_TS;
                opts->tsval = TCP_SKB_CB(skb)->when;
                opts->tsecr = tp->rx_opt.ts_recent;
                remaining -= TCPOLEN_TSTAMP_ALIGNED;
        }
-       if (likely(sysctl_tcp_window_scaling &&
-                  !dst_feature(dst, RTAX_FEATURE_NO_WSCALE))) {
+       if (likely(sysctl_tcp_window_scaling)) {
                opts->ws = tp->rx_opt.rcv_wscale;
                opts->options |= OPTION_WSCALE;
                remaining -= TCPOLEN_WSCALE_ALIGNED;
        }
-       if (likely(sysctl_tcp_sack &&
-                  !dst_feature(dst, RTAX_FEATURE_NO_SACK))) {
+       if (likely(sysctl_tcp_sack)) {
                opts->options |= OPTION_SACK_ADVERTISE;
                if (unlikely(!(OPTION_TS & opts->options)))
                        remaining -= TCPOLEN_SACKPERM_ALIGNED;
@@ -2527,9 +2522,7 @@ static void tcp_connect_init(struct sock *sk)
         * See tcp_input.c:tcp_rcv_state_process case TCP_SYN_SENT.
         */
        tp->tcp_header_len = sizeof(struct tcphdr) +
-               (sysctl_tcp_timestamps &&
-               (!dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) ?
-                 TCPOLEN_TSTAMP_ALIGNED : 0));
+               (sysctl_tcp_timestamps ? TCPOLEN_TSTAMP_ALIGNED : 0);
 
 #ifdef CONFIG_TCP_MD5SIG
        if (tp->af_specific->md5_lookup(sk, sk) != NULL)
@@ -2555,8 +2548,7 @@ static void tcp_connect_init(struct sock *sk)
                                  tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0),
                                  &tp->rcv_wnd,
                                  &tp->window_clamp,
-                                 (sysctl_tcp_window_scaling &&
-                                  !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)),
+                                 sysctl_tcp_window_scaling,
                                  &rcv_wscale);
 
        tp->rx_opt.rcv_wscale = rcv_wscale;
index 1f9534846ca9a3b457e00266cd84ba7b2cb42450..f0126fdd7e04ba8fd3da4b90aadd663411b0617d 100644 (file)
@@ -216,9 +216,8 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                 * force rand to be an odd multiple of UDP_HTABLE_SIZE
                 */
                rand = (rand | 1) * (udptable->mask + 1);
-               for (last = first + udptable->mask + 1;
-                    first != last;
-                    first++) {
+               last = first + udptable->mask + 1;
+               do {
                        hslot = udp_hashslot(udptable, net, first);
                        bitmap_zero(bitmap, PORTS_PER_CHAIN);
                        spin_lock_bh(&hslot->lock);
@@ -238,7 +237,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                                snum += rand;
                        } while (snum != first);
                        spin_unlock_bh(&hslot->lock);
-               }
+               } while (++first != last);
                goto fail;
        } else {
                hslot = udp_hashslot(udptable, net, snum);
index 5f2ec208a8c3a5ff4a8b889f6c3c63e4f1f91b34..0956ebabbff2a604d809678074ce6e338c00d501 100644 (file)
@@ -20,6 +20,7 @@
 #include <net/ipv6.h>
 #include <net/inet_frag.h>
 
+#include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv6.h>
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_helper.h>
@@ -187,6 +188,21 @@ out:
        return nf_conntrack_confirm(skb);
 }
 
+static enum ip6_defrag_users nf_ct6_defrag_user(unsigned int hooknum,
+                                               struct sk_buff *skb)
+{
+#ifdef CONFIG_BRIDGE_NETFILTER
+       if (skb->nf_bridge &&
+           skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)
+               return IP6_DEFRAG_CONNTRACK_BRIDGE_IN;
+#endif
+       if (hooknum == NF_INET_PRE_ROUTING)
+               return IP6_DEFRAG_CONNTRACK_IN;
+       else
+               return IP6_DEFRAG_CONNTRACK_OUT;
+
+}
+
 static unsigned int ipv6_defrag(unsigned int hooknum,
                                struct sk_buff *skb,
                                const struct net_device *in,
@@ -199,8 +215,7 @@ static unsigned int ipv6_defrag(unsigned int hooknum,
        if (skb->nfct)
                return NF_ACCEPT;
 
-       reasm = nf_ct_frag6_gather(skb);
-
+       reasm = nf_ct_frag6_gather(skb, nf_ct6_defrag_user(hooknum, skb));
        /* queued */
        if (reasm == NULL)
                return NF_STOLEN;
index e0b9424fa1b2b3457cc99051b49c22105f5f3aff..312c20adc83f4fe93469010c511acf6b82aa42d2 100644 (file)
@@ -168,13 +168,14 @@ out:
 /* Creation primitives. */
 
 static __inline__ struct nf_ct_frag6_queue *
-fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst)
+fq_find(__be32 id, u32 user, struct in6_addr *src, struct in6_addr *dst)
 {
        struct inet_frag_queue *q;
        struct ip6_create_arg arg;
        unsigned int hash;
 
        arg.id = id;
+       arg.user = user;
        arg.src = src;
        arg.dst = dst;
 
@@ -559,7 +560,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
        return 0;
 }
 
-struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
+struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
 {
        struct sk_buff *clone;
        struct net_device *dev = skb->dev;
@@ -605,7 +606,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
        if (atomic_read(&nf_init_frags.mem) > nf_init_frags.high_thresh)
                nf_ct_frag6_evictor();
 
-       fq = fq_find(fhdr->identification, &hdr->saddr, &hdr->daddr);
+       fq = fq_find(fhdr->identification, user, &hdr->saddr, &hdr->daddr);
        if (fq == NULL) {
                pr_debug("Can't find and can't create new queue\n");
                goto ret_orig;
index 4d98549a68683d89b946a3cd0fa50eb5a1f58019..3b3a95607125c559d039e21f5bdaba7e66fac48b 100644 (file)
@@ -72,6 +72,7 @@ struct frag_queue
        struct inet_frag_queue  q;
 
        __be32                  id;             /* fragment id          */
+       u32                     user;
        struct in6_addr         saddr;
        struct in6_addr         daddr;
 
@@ -141,7 +142,7 @@ int ip6_frag_match(struct inet_frag_queue *q, void *a)
        struct ip6_create_arg *arg = a;
 
        fq = container_of(q, struct frag_queue, q);
-       return (fq->id == arg->id &&
+       return (fq->id == arg->id && fq->user == arg->user &&
                        ipv6_addr_equal(&fq->saddr, arg->src) &&
                        ipv6_addr_equal(&fq->daddr, arg->dst));
 }
@@ -163,6 +164,7 @@ void ip6_frag_init(struct inet_frag_queue *q, void *a)
        struct ip6_create_arg *arg = a;
 
        fq->id = arg->id;
+       fq->user = arg->user;
        ipv6_addr_copy(&fq->saddr, arg->src);
        ipv6_addr_copy(&fq->daddr, arg->dst);
 }
@@ -243,6 +245,7 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,
        unsigned int hash;
 
        arg.id = id;
+       arg.user = IP6_DEFRAG_LOCAL_DELIVER;
        arg.src = src;
        arg.dst = dst;
 
index 5b9af508b8f2b83f51945d93451fc9cf81d63cc4..7208a06576c6843996a02796804d33e61a524ee8 100644 (file)
@@ -185,6 +185,13 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 
        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+       /* check for timestamp cookie support */
+       memset(&tcp_opt, 0, sizeof(tcp_opt));
+       tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+       if (tcp_opt.saw_tstamp)
+               cookie_check_timestamp(&tcp_opt);
+
        ret = NULL;
        req = inet6_reqsk_alloc(&tcp6_request_sock_ops);
        if (!req)
@@ -218,6 +225,12 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
        req->expires = 0UL;
        req->retrans = 0;
        ireq->ecn_ok            = 0;
+       ireq->snd_wscale        = tcp_opt.snd_wscale;
+       ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+       ireq->sack_ok           = tcp_opt.sack_ok;
+       ireq->wscale_ok         = tcp_opt.wscale_ok;
+       ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+       req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
        treq->rcv_isn = ntohl(th->seq) - 1;
        treq->snt_isn = cookie;
 
@@ -253,21 +266,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
                        goto out_free;
        }
 
-       /* check for timestamp cookie support */
-       memset(&tcp_opt, 0, sizeof(tcp_opt));
-       tcp_parse_options(skb, &tcp_opt, &hash_location, 0, dst);
-
-       if (tcp_opt.saw_tstamp)
-               cookie_check_timestamp(&tcp_opt);
-
-       req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
-       ireq->snd_wscale        = tcp_opt.snd_wscale;
-       ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-       ireq->sack_ok           = tcp_opt.sack_ok;
-       ireq->wscale_ok         = tcp_opt.wscale_ok;
-       ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-
        req->window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
        tcp_select_initial_window(tcp_full_space(sk), req->mss,
                                  &req->rcv_wnd, &req->window_clamp,
index ee9cf62458d4bb1f97c5f04f1639badb9ceda262..febfd595a40dd517d9deb5b2c574a0912669fff7 100644 (file)
@@ -1169,7 +1169,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
        struct inet6_request_sock *treq;
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct tcp_sock *tp = tcp_sk(sk);
-       struct dst_entry *dst = __sk_dst_get(sk);
        __u32 isn = TCP_SKB_CB(skb)->when;
 #ifdef CONFIG_SYN_COOKIES
        int want_cookie = 0;
@@ -1208,7 +1207,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
        tcp_clear_options(&tmp_opt);
        tmp_opt.mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr);
        tmp_opt.user_mss = tp->rx_opt.user_mss;
-       tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+       tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
        if (tmp_opt.cookie_plus > 0 &&
            tmp_opt.saw_tstamp &&
index b95699f00545a1f5f5733590071a813599bcae2f..847ffca401841e57e5ffec634c78a2dc472b82fa 100644 (file)
@@ -1366,6 +1366,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
               == sysctl_ip_vs_sync_threshold[0])) ||
             ((cp->protocol == IPPROTO_TCP) && (cp->old_state != cp->state) &&
              ((cp->state == IP_VS_TCP_S_FIN_WAIT) ||
+              (cp->state == IP_VS_TCP_S_CLOSE) ||
               (cp->state == IP_VS_TCP_S_CLOSE_WAIT) ||
               (cp->state == IP_VS_TCP_S_TIME_WAIT)))))
                ip_vs_sync_conn(cp);
index e55a6861d26f76ad7c1276cd6662e13cfda04ff1..6bde12da2fe0038660f6d3b7b195e8596c289e1e 100644 (file)
@@ -2714,6 +2714,8 @@ static int ip_vs_genl_parse_service(struct ip_vs_service_user_kern *usvc,
        if (!(nla_af && (nla_fwmark || (nla_port && nla_protocol && nla_addr))))
                return -EINVAL;
 
+       memset(usvc, 0, sizeof(*usvc));
+
        usvc->af = nla_get_u16(nla_af);
 #ifdef CONFIG_IP_VS_IPV6
        if (usvc->af != AF_INET && usvc->af != AF_INET6)
@@ -2901,6 +2903,8 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,
        if (!(nla_addr && nla_port))
                return -EINVAL;
 
+       memset(udest, 0, sizeof(*udest));
+
        nla_memcpy(&udest->addr, nla_addr, sizeof(udest->addr));
        udest->port = nla_get_u16(nla_port);
 
index 020562164b56efa584a29c7571925c3371021735..e0516a22be2e06052da233423be8b88dde1680f4 100644 (file)
@@ -415,7 +415,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
 {
        struct sock *sk = sock->sk;
        struct sockaddr_pkt *saddr = (struct sockaddr_pkt *)msg->msg_name;
-       struct sk_buff *skb;
+       struct sk_buff *skb = NULL;
        struct net_device *dev;
        __be16 proto = 0;
        int err;
@@ -437,6 +437,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
         */
 
        saddr->spkt_device[13] = 0;
+retry:
        rcu_read_lock();
        dev = dev_get_by_name_rcu(sock_net(sk), saddr->spkt_device);
        err = -ENODEV;
@@ -456,58 +457,48 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
        if (len > dev->mtu + dev->hard_header_len)
                goto out_unlock;
 
-       err = -ENOBUFS;
-       skb = sock_wmalloc(sk, len + LL_RESERVED_SPACE(dev), 0, GFP_KERNEL);
-
-       /*
-        * If the write buffer is full, then tough. At this level the user
-        * gets to deal with the problem - do your own algorithmic backoffs.
-        * That's far more flexible.
-        */
-
-       if (skb == NULL)
-               goto out_unlock;
-
-       /*
-        *      Fill it in
-        */
-
-       /* FIXME: Save some space for broken drivers that write a
-        * hard header at transmission time by themselves. PPP is the
-        * notable one here. This should really be fixed at the driver level.
-        */
-       skb_reserve(skb, LL_RESERVED_SPACE(dev));
-       skb_reset_network_header(skb);
-
-       /* Try to align data part correctly */
-       if (dev->header_ops) {
-               skb->data -= dev->hard_header_len;
-               skb->tail -= dev->hard_header_len;
-               if (len < dev->hard_header_len)
-                       skb_reset_network_header(skb);
+       if (!skb) {
+               size_t reserved = LL_RESERVED_SPACE(dev);
+               unsigned int hhlen = dev->header_ops ? dev->hard_header_len : 0;
+
+               rcu_read_unlock();
+               skb = sock_wmalloc(sk, len + reserved, 0, GFP_KERNEL);
+               if (skb == NULL)
+                       return -ENOBUFS;
+               /* FIXME: Save some space for broken drivers that write a hard
+                * header at transmission time by themselves. PPP is the notable
+                * one here. This should really be fixed at the driver level.
+                */
+               skb_reserve(skb, reserved);
+               skb_reset_network_header(skb);
+
+               /* Try to align data part correctly */
+               if (hhlen) {
+                       skb->data -= hhlen;
+                       skb->tail -= hhlen;
+                       if (len < hhlen)
+                               skb_reset_network_header(skb);
+               }
+               err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+               if (err)
+                       goto out_free;
+               goto retry;
        }
 
-       /* Returns -EFAULT on error */
-       err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+
        skb->protocol = proto;
        skb->dev = dev;
        skb->priority = sk->sk_priority;
        skb->mark = sk->sk_mark;
-       if (err)
-               goto out_free;
-
-       /*
-        *      Now send it
-        */
 
        dev_queue_xmit(skb);
        rcu_read_unlock();
        return len;
 
-out_free:
-       kfree_skb(skb);
 out_unlock:
        rcu_read_unlock();
+out_free:
+       kfree_skb(skb);
        return err;
 }