1. 24 Sep, 2012 1 commit
  2. 23 Sep, 2012 2 commits
    • David S. Miller's avatar
      netlink: Rearrange netlink_kernel_cfg to save space on 64-bit. · c9d2ea96
      David S. Miller authored
      Suggested by Jan Engelhardt.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c9d2ea96
    • Neal Cardwell's avatar
      tcp: TCP Fast Open Server - record retransmits after 3WHS · 30099b2e
      Neal Cardwell authored
      When recording the number of SYNACK retransmits for servers using TCP
      Fast Open, fix the code to ensure that we copy over the retransmit
      count from the request_sock after we receive the ACK that completes
      the 3-way handshake.
      
      The story here is similar to that of SYNACK RTT
      measurements. Previously we were always doing this in
      tcp_v4_syn_recv_sock(). However, for TCP Fast Open connections
      tcp_v4_conn_req_fastopen() calls tcp_v4_syn_recv_sock() at the time we
      receive the SYN. So for TFO we must copy the final SYNACK retransmit
      count in tcp_rcv_state_process().
      
      Note that copying over the SYNACK retransmit count will give us the
      correct count since, as is mentioned in a comment in
      tcp_retransmit_timer(), before we receive an ACK for our SYN-ACK a TFO
      passive connection does not retransmit anything else (e.g., data or
      FIN segments).
      Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30099b2e
  3. 22 Sep, 2012 18 commits
  4. 21 Sep, 2012 15 commits
    • Wei Yongjun's avatar
      can: mscan-mpc5xxx: fix return value check in mpc512x_can_get_clock() · f61bd058
      Wei Yongjun authored
      In case of error, the function clk_get() returns ERR_PTR()
      and never returns NULL pointer. The NULL test in the error
      handling should be replaced with IS_ERR().
      
      dpatch engine is used to auto generated this patch.
      (https://github.com/weiyj/dpatch)
      
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Acked-by: default avatarWolfgang Grandegger <wg@grandegger.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      f61bd058
    • Randy Dunlap's avatar
      can: usb: peak: rename peak_usb dump_mem function · 56b9f301
      Randy Dunlap authored
      Rename generic-sounding function dump_mem() to pcan_dump_mem()
      so that it does not conflict with the dump_mem() function in
      arch/sh/include/asm/kdebug.h.
      
      drivers/net/can/usb/peak_usb/pcan_usb_core.c: error: conflicting types for 'dump_mem':  => 56:6
      drivers/net/can/usb/peak_usb/pcan_usb_core.h: error: conflicting types for 'dump_mem':  => 134:6
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: Stephane Grosjean <s.grosjean@peak-system.com>
      Cc: Wolfgang Grandegger <wg@grandegger.com>
      Cc: Marc Kleine-Budde <mkl@pengutronix.de>
      [mkl: convert all users of dump_mem(), too]
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      56b9f301
    • AnilKumar Ch's avatar
      can: c_can: Adopt pinctrl support · 006cd138
      AnilKumar Ch authored
      Adopt pinctrl support to c_can driver based on c_can device
      pointer, pinctrl driver configure SoC pins to d_can mode
      according to definitions provided in .dts file.
      
      In device specific device tree file 'pinctrl-names = "default";'
      and 'pinctrl-0 = <&d_can1_pins>;' needs to add to configure pins
      from c_can driver. d_can1_pins node contains the pinmux/config
      details of d_can L/H pins.
      Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      006cd138
    • AnilKumar Ch's avatar
      can: c_can: Add d_can suspend resume support · 82120032
      AnilKumar Ch authored
      Adds suspend resume support to DCAN driver which enables
      DCAN power down mode bit (PDR). Then DCAN will ack the local
      power-down mode by setting PDA bit in STATUS register.
      Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      82120032
    • AnilKumar Ch's avatar
      can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controller · 4cdd34b2
      AnilKumar Ch authored
      Add Runtime PM support to C_CAN/D_CAN controller. The runtime PM
      APIs control clocks for C_CAN/D_CAN IP and prevent access to the
      register of C_CAN/D_CAN IP when clock is turned off.
      Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      4cdd34b2
    • AnilKumar Ch's avatar
      can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller · 2469627d
      AnilKumar Ch authored
      Add device tree support to C_CAN/D_CAN controller and usage details
      are added to device tree documentation. Driver was tested on AM335x
      EVM.
      Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
      For the of binding doc:
      Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      2469627d
    • AnilKumar Ch's avatar
      can: c_can: Modify c_can device names · f27b1db9
      AnilKumar Ch authored
      Modify c_can device names from *_CAN_DEVTYPE to BOSCH_*_CAN to make
      use of same names for array indexes in c_can_id_table[] as well as
      device names.
      
      This patch also add indexes to c_can_id_table array.
      Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      f27b1db9
    • Pablo Neira Ayuso's avatar
      netlink: use <linux/export.h> instead of <linux/module.h> · abb17e6c
      Pablo Neira Ayuso authored
      Since (9f00d977 netlink: hide struct module parameter in netlink_kernel_create),
      linux/netlink.h includes linux/module.h because of the use of THIS_MODULE.
      
      Use linux/export.h instead, as suggested by Stephen Rothwell, which is
      significantly smaller and defines THIS_MODULES.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      abb17e6c
    • David S. Miller's avatar
      sunbmac: Remove unused local variable. · 0bfd6075
      David S. Miller authored
      Commit eb716c54 ("sunbmac: remove
      unnecessary setting of skb->dev") caused the local varible 'dev'
      in bigmac_init_rings to become unused.  And now the compiler
      warns about it.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0bfd6075
    • Jiri Pirko's avatar
      team: send port changed when added · 10f3f51d
      Jiri Pirko authored
      On some hw, link is not up during adding iface to team. That causes event
      not being sent to userspace and that may cause confusion.
      Fix this bug by sending port changed event once it's added to team.
      Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      10f3f51d
    • Christoph Fritz's avatar
      ipconfig: add nameserver IPs to kernel-parameter ip= · 5e953778
      Christoph Fritz authored
      On small systems (e.g. embedded ones) IP addresses are often configured
      by bootloaders and get assigned to kernel via parameter "ip=".  If set to
      "ip=dhcp", even nameserver entries from DHCP daemons are handled. These
      entries exported in /proc/net/pnp are commonly linked by /etc/resolv.conf.
      
      To configure nameservers for networks without DHCP, this patch adds option
      <dns0-ip> and <dns1-ip> to kernel-parameter 'ip='.
      Signed-off-by: default avatarChristoph Fritz <chf.fritz@googlemail.com>
      Tested-by: default avatarJan Weitzel <j.weitzel@phytec.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5e953778
    • Bjørn Mork's avatar
      net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200 · 42d94dcb
      Bjørn Mork authored
      One of the modes of Huawei E367 has this QMI/wwan interface:
      
       I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=07 Driver=(none)
       E:  Ad=83(I) Atr=03(Int.) MxPS=  64 Ivl=2ms
       E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
       E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
      
      Huawei use subclass and protocol to identify vendor specific
      functions, so adding a new vendor rule for this combination.
      
      The Pantech devices UML290 (106c:3718) and P4200 (106c:3721) use
      the same subclass to identify the QMI/wwan function.  Replace the
      existing device specific UML290 entries with generic vendor matching,
      adding support for the Pantech P4200.
      
      The ZTE MF683 has 6 vendor specific interfaces, all using
      ff/ff/ff for cls/sub/prot.  Adding a match on interface #5 which
      is a QMI/wwan interface.
      
      Cc: Fangxiaozhi (Franko) <fangxiaozhi@huawei.com>
      Cc: Thomas Schäfer <tschaefer@t-online.de>
      Cc: Dan Williams <dcbw@redhat.com>
      Cc: Shawn J. Goff <shawn7400@gmail.com>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      42d94dcb
    • Amerigo Wang's avatar
      l2tp: fix compile error when CONFIG_IPV6=m and CONFIG_L2TP=y · fc181625
      Amerigo Wang authored
      When CONFIG_IPV6=m and CONFIG_L2TP=y, I got the following compile error:
      
        LD      init/built-in.o
      net/built-in.o: In function `l2tp_xmit_core':
      l2tp_core.c:(.text+0x147781): undefined reference to `inet6_csk_xmit'
      net/built-in.o: In function `l2tp_tunnel_create':
      (.text+0x149067): undefined reference to `udpv6_encap_enable'
      net/built-in.o: In function `l2tp_ip6_recvmsg':
      l2tp_ip6.c:(.text+0x14e991): undefined reference to `ipv6_recv_error'
      net/built-in.o: In function `l2tp_ip6_sendmsg':
      l2tp_ip6.c:(.text+0x14ec64): undefined reference to `fl6_sock_lookup'
      l2tp_ip6.c:(.text+0x14ed6b): undefined reference to `datagram_send_ctl'
      l2tp_ip6.c:(.text+0x14eda0): undefined reference to `fl6_sock_lookup'
      l2tp_ip6.c:(.text+0x14ede5): undefined reference to `fl6_merge_options'
      l2tp_ip6.c:(.text+0x14edf4): undefined reference to `ipv6_fixup_options'
      l2tp_ip6.c:(.text+0x14ee5d): undefined reference to `fl6_update_dst'
      l2tp_ip6.c:(.text+0x14eea3): undefined reference to `ip6_dst_lookup_flow'
      l2tp_ip6.c:(.text+0x14eee7): undefined reference to `ip6_dst_hoplimit'
      l2tp_ip6.c:(.text+0x14ef8b): undefined reference to `ip6_append_data'
      l2tp_ip6.c:(.text+0x14ef9d): undefined reference to `ip6_flush_pending_frames'
      l2tp_ip6.c:(.text+0x14efe2): undefined reference to `ip6_push_pending_frames'
      net/built-in.o: In function `l2tp_ip6_destroy_sock':
      l2tp_ip6.c:(.text+0x14f090): undefined reference to `ip6_flush_pending_frames'
      l2tp_ip6.c:(.text+0x14f0a0): undefined reference to `inet6_destroy_sock'
      net/built-in.o: In function `l2tp_ip6_connect':
      l2tp_ip6.c:(.text+0x14f14d): undefined reference to `ip6_datagram_connect'
      net/built-in.o: In function `l2tp_ip6_bind':
      l2tp_ip6.c:(.text+0x14f4fe): undefined reference to `ipv6_chk_addr'
      net/built-in.o: In function `l2tp_ip6_init':
      l2tp_ip6.c:(.init.text+0x73fa): undefined reference to `inet6_add_protocol'
      l2tp_ip6.c:(.init.text+0x740c): undefined reference to `inet6_register_protosw'
      net/built-in.o: In function `l2tp_ip6_exit':
      l2tp_ip6.c:(.exit.text+0x1954): undefined reference to `inet6_unregister_protosw'
      l2tp_ip6.c:(.exit.text+0x1965): undefined reference to `inet6_del_protocol'
      net/built-in.o:(.rodata+0xf2d0): undefined reference to `inet6_release'
      net/built-in.o:(.rodata+0xf2d8): undefined reference to `inet6_bind'
      net/built-in.o:(.rodata+0xf308): undefined reference to `inet6_ioctl'
      net/built-in.o:(.data+0x1af40): undefined reference to `ipv6_setsockopt'
      net/built-in.o:(.data+0x1af48): undefined reference to `ipv6_getsockopt'
      net/built-in.o:(.data+0x1af50): undefined reference to `compat_ipv6_setsockopt'
      net/built-in.o:(.data+0x1af58): undefined reference to `compat_ipv6_getsockopt'
      make: *** [vmlinux] Error 1
      
      This is due to l2tp uses symbols from IPV6, so when IPV6
      is a module, l2tp is not allowed to be builtin.
      
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fc181625
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · b216a4d8
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      This series contains updates to igb and ixgbevf.
      
      v2: updated patch description in 04 patch (ixgbevf: scheduling while
          atomic in reset hw path)
       ...
      Akeem G. Abodunrin (1):
        igb: Support to enable EEE on all eee_supported devices
      
      Alexander Duyck (2):
        igb: Remove artificial restriction on RQDPC stat reading
        ixgbevf: Add support for VF API negotiation
      
      John Fastabend (1):
        ixgbevf: scheduling while atomic in reset hw path
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b216a4d8
    • Joe Perches's avatar
      net1080: Neaten netdev_dbg use · 127a4794
      Joe Perches authored
      Remove unnecessary temporary variable and #ifdef DEBUG block.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      127a4794
  5. 20 Sep, 2012 4 commits