Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be9c6d91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:
 "Just a bunch of small fixes and tidy ups:

   1) Finish the "busy_poll" renames, from Eliezer Tamir.

   2) Fix RCU stalls in IFB driver, from Ding Tianhong.

   3) Linearize buffers properly in tun/macvtap zerocopy code.

   4) Don't crash on rmmod in vxlan, from Pravin B Shelar.

   5) Spinlock used before init in alx driver, from Maarten Lankhorst.

   6) A sparse warning fix in bnx2x broke TSO checksums, fix from Dmitry
      Kravkov.

   7) Dummy and ifb driver load failure paths can oops, fixes from Tan
      Xiaojun and Ding Tianhong.

   8) Correct MTU calculations in IP tunnels, from Alexander Duyck.

   9) Account all TCP retransmits in SNMP stats properly, from Yuchung
      Cheng.

  10) atl1e and via-rhine do not handle DMA mapping failures properly,
      from Neil Horman.

  11) Various equal-cost multipath route fixes in ipv6 from Hannes
      Frederic Sowa"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
  ipv6: only static routes qualify for equal cost multipathing
  via-rhine: fix dma mapping errors
  atl1e: fix dma mapping warnings
  tcp: account all retransmit failures
  usb/net/r815x: fix cast to restricted __le32
  usb/net/r8152: fix integer overflow in expression
  net: access page->private by using page_private
  net: strict_strtoul is obsolete, use kstrtoul instead
  drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
  drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe
  drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
  net/usb: add relative mii functions for r815x
  net/tipc: use %*phC to dump small buffers in hex form
  qlcnic: Adding Maintainers.
  gre: Fix MTU sizing check for gretap tunnels
  pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts
  pkt_sched: sch_qfq: improve efficiency of make_eligible
  gso: Update tunnel segmentation to support Tx checksum offload
  inet: fix spacing in assignment
  ifb: fix oops when loading the ifb failed
  ...
parents 03ce3ca4 307f2fb9

Documentation/sysctl/net.txt

+9 −8
Original line number Diff line number Diff line
@@ -50,26 +50,27 @@ The maximum number of packets that kernel can handle on a NAPI interrupt, 
it's a Per-CPU variable.

Default: 64



low_latency_read

busy_read

----------------

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL)

Approximate time in us to busy loop waiting for packets on the device queue.

This sets the default value of the SO_LL socket option.

Can be set or overridden per socket by setting socket option SO_LL, which is

the preferred method of enabling.

If you need to enable the feature globally via sysctl, a value of 50 is recommended.

This sets the default value of the SO_BUSY_POLL socket option.

Can be set or overridden per socket by setting socket option SO_BUSY_POLL,

which is the preferred method of enabling. If you need to enable the feature

globally via sysctl, a value of 50 is recommended.

Will increase power usage.

Default: 0 (off)



low_latency_poll

busy_poll

----------------

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL)

Approximate time in us to busy loop waiting for events.

Recommended value depends on the number of sockets you poll on.

For several sockets 50, for several hundreds 100.

For more than that you probably want to use epoll.

Note that only sockets with SO_LL set will be busy polled, so you want to either

selectively set SO_LL on those sockets or set sysctl.net.low_latency_read globally.

Note that only sockets with SO_BUSY_POLL set will be busy polled,

so you want to either selectively set SO_BUSY_POLL on those sockets or set

sysctl.net.busy_read globally.

Will increase power usage.

Default: 0 (off)

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -6681,10 +6681,12 @@ F: Documentation/networking/LICENSE.qla3xxx 
F:	drivers/net/ethernet/qlogic/qla3xxx.*



QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

M:	Himanshu Madhani <himanshu.madhani@qlogic.com>

M:	Rajesh Borundia <rajesh.borundia@qlogic.com>

M:	Shahed Shaikh <shahed.shaikh@qlogic.com>

M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

M:	Sony Chacko <sony.chacko@qlogic.com>

M:	Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>

M:	linux-driver@qlogic.com

L:	netdev@vger.kernel.org

S:	Supported

arch/alpha/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL			46



#endif /* _UAPI_ASM_SOCKET_H */

arch/avr32/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -74,6 +74,6 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL		46



#endif /* __ASM_AVR32_SOCKET_H */

arch/cris/include/uapi/asm/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 


#define SO_SELECT_ERR_QUEUE	45



#define SO_LL			46

#define SO_BUSY_POLL		46



#endif /* _ASM_SOCKET_H */