1. 23 Apr, 2013 6 commits
  2. 22 Apr, 2013 22 commits
  3. 21 Apr, 2013 4 commits
    • Patrick McHardy's avatar
      qeth: fix VLAN related compilation errors · 91b1c1aa
      Patrick McHardy authored
      drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_add_vlan_mc':
      >> drivers/s390/net/qeth_l3_main.c:1662:3: error: too few arguments to function '__vlan_find_dev_deep'
         include/linux/if_vlan.h:88:27: note: declared here
         drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_add_vlan_mc6':
      >> drivers/s390/net/qeth_l3_main.c:1723:3: error: too few arguments to function '__vlan_find_dev_deep'
         include/linux/if_vlan.h:88:27: note: declared here
         drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_free_vlan_addresses4':
      >> drivers/s390/net/qeth_l3_main.c:1767:2: error: too few arguments to function '__vlan_find_dev_deep'
         include/linux/if_vlan.h:88:27: note: declared here
         drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_free_vlan_addresses6':
      >> drivers/s390/net/qeth_l3_main.c:1797:2: error: too few arguments to function '__vlan_find_dev_deep'
         include/linux/if_vlan.h:88:27: note: declared here
         drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_process_inbound_buffer':
      >> drivers/s390/net/qeth_l3_main.c:1980:6: error: too few arguments to function '__vlan_hwaccel_put_tag'
         include/linux/if_vlan.h:234:31: note: declared here
         drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_verify_vlan_dev':
      >> drivers/s390/net/qeth_l3_main.c:2089:3: error: too few arguments to function '__vlan_find_dev_deep'
         include/linux/if_vlan.h:88:27: note: declared here
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91b1c1aa
    • Patrick McHardy's avatar
      net: vlan: fix up vlan_proto_idx() for CONFIG_BUG=n · 8da63a65
      Patrick McHardy authored
      Add missing return statement for CONFIG_BUG=n.
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8da63a65
    • Patrick McHardy's avatar
      net: vlan: fix dummy function signatures for CONFIG_VLAN=n · 9fae27b3
      Patrick McHardy authored
      Fix up some function signatures for CONFIG_VLAN=n that were missed during
      the 802.1ad support patches.
      
      Found by the kbuild robot.
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9fae27b3
    • Patrick McHardy's avatar
      net: vlan: fix memory leak in vlan_info_rcu_free() · cf2c014a
      Patrick McHardy authored
      The following leak is reported by kmemleak:
      
      [   86.812073] kmemleak: Found object by alias at 0xffff88006ecc76f0
      [   86.816019] Pid: 739, comm: kworker/u:1 Not tainted 3.9.0-rc5+ #842
      [   86.816019] Call Trace:
      [   86.816019]  <IRQ>  [<ffffffff81151c58>] find_and_get_object+0x8c/0xdf
      [   86.816019]  [<ffffffff8190e90d>] ? vlan_info_rcu_free+0x33/0x49
      [   86.816019]  [<ffffffff81151cbe>] delete_object_full+0x13/0x2f
      [   86.816019]  [<ffffffff8194bbb6>] kmemleak_free+0x26/0x45
      [   86.816019]  [<ffffffff8113e8c7>] slab_free_hook+0x1e/0x7b
      [   86.816019]  [<ffffffff81141c05>] kfree+0xce/0x14b
      [   86.816019]  [<ffffffff8190e90d>] vlan_info_rcu_free+0x33/0x49
      [   86.816019]  [<ffffffff810d0b0b>] rcu_do_batch+0x261/0x4e7
      
      The reason is that in vlan_info_rcu_free() we don't take the VLAN protocol
      into account when iterating over the vlan_devices_array.
      Reported-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Tested-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cf2c014a
  4. 19 Apr, 2013 8 commits
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 95a06161
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains a small batch of Netfilter
      updates for your net-next tree, they are:
      
      * Three patches that provide more accurate error reporting to
        user-space, instead of -EPERM, in IPv4/IPv6 netfilter re-routing
        code and NAT, from Patrick McHardy.
      
      * Update copyright statements in Netfilter filters of
        Patrick McHardy, from himself.
      
      * Add Kconfig dependency on the raw/mangle tables to the
        rpfilter, from Florian Westphal.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      95a06161
    • Andy Gospodarek's avatar
      bond: add support to read speed and duplex via ethtool · bb5b052f
      Andy Gospodarek authored
      This patch adds support for the get_settings ethtool op to the bonding
      driver.  This was motivated by users who wanted to get the speed of the
      bond and compare that against throughput to understand utilization.
      The behavior before this patch was added was problematic when computing
      line utilization after trying to get link-speed and throughput via SNMP.
      
      Output from ethtool looks like this for a round-robin bond:
      
      Settings for bond0:
      	Supported ports: [ ]
      	Supported link modes:   Not reported
      	Supported pause frame use: No
      	Supports auto-negotiation: No
      	Advertised link modes:  Not reported
      	Advertised pause frame use: No
      	Advertised auto-negotiation: No
      	Speed: 11000Mb/s
      	Duplex: Full
      	Port: Other
      	PHYAD: 0
      	Transceiver: internal
      	Auto-negotiation: off
      	MDI-X: Unknown
      	Link detected: yes
      
      I tested this and verified it works as expected.  A test was also done
      on a version backported to an older kernel and it worked well there.
      
      v2: Switch to using ethtool_cmd_speed_set to set speed, added check to
      SLAVE_IS_OK for each slave in bond, dropped mode-specific calculations
      as they were not needed, and set port type to 'Other.'
      
      v3: Fix useless assignment and checkpatch warning.
      Signed-off-by: default avatarAndy Gospodarek <andy@greyhouse.net>
      Reviewed-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb5b052f
    • Daniel Borkmann's avatar
      packet: move hw/sw timestamp extraction into a small helper · 4b457bdf
      Daniel Borkmann authored
      This patch introduces a small, internal helper function, that is used by
      PF_PACKET. Based on the flags that are passed, it extracts the packet
      timestamp in the receive path. This is merely a refactoring to remove
      some duplicate code in tpacket_rcv(), to make it more readable, and to
      enable others to use this function in PF_PACKET as well, e.g. for TX.
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4b457bdf
    • Daniel Borkmann's avatar
      net: socket: move ktime2ts to ktime header api · 6e94d1ef
      Daniel Borkmann authored
      Currently, ktime2ts is a small helper function that is only used in
      net/socket.c. Move this helper into the ktime API as a small inline
      function, so that i) it's maintained together with ktime routines,
      and ii) also other files can make use of it. The function is named
      ktime_to_timespec_cond() and placed into the generic part of ktime,
      since we internally make use of ktime_to_timespec(). ktime_to_timespec()
      itself does not check the ktime variable for zero, hence, we name
      this function ktime_to_timespec_cond() for only a conditional
      conversion, and adapt its users to it.
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e94d1ef
    • David S. Miller's avatar
    • David S. Miller's avatar
      net: Add missing netdev feature strings for NETIF_F_HW_VLAN_STAG_* · 2d6577f1
      David S. Miller authored
      Noticed by Ben Hutchings.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2d6577f1
    • David S. Miller's avatar
      Merge branch 'qlcnic' · 92352df1
      David S. Miller authored
      Rajesh Borundia says:
      
      ====================
      * "qlcnic: Change 82xx adapter VLAN id endian type".
        - Adapter requires VLAN id in little endian. VLAN id was being
          converted to __le16 and then passed as a parameter. Pass VLAN id
          as u16 and then use cpu_to_le16 at appropriate places. It is
          appropriate for net-next as SR-IOV patches have a dependency on it.
      * "qlcnic: Fix loopback test for SR-IOV PF".
        - It is appropriate for net-next as change is needed for SRIOV PF
          only.
      * Remaining patches add enhancements to SR-IOV functionality like
        - FLR handling
        - Adapter reset recovery handling
        - iproute2 tool support for configuring MAC address, Tx rate and
          VLAN id.
        - Mailbox polling support for SR-IOV PF in case mailbox interrupts
          are disabled.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      92352df1
    • Rajesh Borundia's avatar
      c6376278