2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
linux-next/drivers/staging/vt6655
Linus Torvalds cc998ff881 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking changes from David Miller:
 "Noteworthy changes this time around:

   1) Multicast rejoin support for team driver, from Jiri Pirko.

   2) Centralize and simplify TCP RTT measurement handling in order to
      reduce the impact of bad RTO seeding from SYN/ACKs.  Also, when
      both timestamps and local RTT measurements are available prefer
      the later because there are broken middleware devices which
      scramble the timestamp.

      From Yuchung Cheng.

   3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
      memory consumed to queue up unsend user data.  From Eric Dumazet.

   4) Add a "physical port ID" abstraction for network devices, from
      Jiri Pirko.

   5) Add a "suppress" operation to influence fib_rules lookups, from
      Stefan Tomanek.

   6) Add a networking development FAQ, from Paul Gortmaker.

   7) Extend the information provided by tcp_probe and add ipv6 support,
      from Daniel Borkmann.

   8) Use RCU locking more extensively in openvswitch data paths, from
      Pravin B Shelar.

   9) Add SCTP support to openvswitch, from Joe Stringer.

  10) Add EF10 chip support to SFC driver, from Ben Hutchings.

  11) Add new SYNPROXY netfilter target, from Patrick McHardy.

  12) Compute a rate approximation for sending in TCP sockets, and use
      this to more intelligently coalesce TSO frames.  Furthermore, add
      a new packet scheduler which takes advantage of this estimate when
      available.  From Eric Dumazet.

  13) Allow AF_PACKET fanouts with random selection, from Daniel
      Borkmann.

  14) Add ipv6 support to vxlan driver, from Cong Wang"

Resolved conflicts as per discussion.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
  openvswitch: Fix alignment of struct sw_flow_key.
  netfilter: Fix build errors with xt_socket.c
  tcp: Add missing braces to do_tcp_setsockopt
  caif: Add missing braces to multiline if in cfctrl_linkup_request
  bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
  vxlan: Fix kernel panic on device delete.
  net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
  net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
  icplus: Use netif_running to determine device state
  ethernet/arc/arc_emac: Fix huge delays in large file copies
  tuntap: orphan frags before trying to set tx timestamp
  tuntap: purge socket error queue on detach
  qlcnic: use standard NAPI weights
  ipv6:introduce function to find route for redirect
  bnx2x: VF RSS support - VF side
  bnx2x: VF RSS support - PF side
  vxlan: Notify drivers for listening UDP port changes
  net: usbnet: update addr_assign_type if appropriate
  driver/net: enic: update enic maintainers and driver
  driver/net: enic: Exposing symbols for Cisco's low latency driver
  ...
2013-09-05 14:54:29 -07:00
..
80211hdr.h Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211hdr.h 2013-05-16 15:52:00 -07:00
80211mgr.c Staging: vt6655: Fixed ERROR: do not use C99 // comments in 80211mgr.c 2013-05-16 15:51:58 -07:00
80211mgr.h Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211mgr.h 2013-05-16 15:51:58 -07:00
aes_ccmp.c Staging: vt6655: aes_ccmp: fixed a brace coding style 2013-06-24 15:57:40 -07:00
aes_ccmp.h Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/aes_ccmp.h. 2013-05-16 15:52:00 -07:00
baseband.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
baseband.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
bssdb.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
bssdb.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
card.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
card.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
channel.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
channel.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
country.h staging:vt6655:country: Whitespace cleanups 2013-03-18 17:21:35 -07:00
datarate.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
datarate.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
desc.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
device_cfg.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
device_main.c vt6655/trivial: replace numeric with standard PM state macros 2013-07-26 16:30:06 -07:00
device.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
dpc.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
dpc.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
hostap.c staging: vt6655: inherit addr_assign_type along with dev_addr 2013-09-03 20:57:50 -04:00
hostap.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
IEEE11h.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
IEEE11h.h staging:vt6655:IEEE11h: Whitespace cleanups 2013-03-18 17:21:34 -07:00
iocmd.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
ioctl.c staging: vt6655: inherit addr_assign_type along with dev_addr 2013-09-03 20:57:50 -04:00
ioctl.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
iowpa.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
iwctl.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
iwctl.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
Kconfig Staging: vt665?: prevent modules from being built into the kernel. 2011-04-04 21:33:26 -07:00
key.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
key.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
mac.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
mac.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
Makefile Staging: vt6655: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
mib.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
mib.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
michael.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
michael.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
power.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
power.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
rc4.c staging:vt6655:rc4: Whitespace cleanups 2013-03-18 17:21:37 -07:00
rc4.h staging:vt6655:rc4: Whitespace cleanups 2013-03-18 17:21:37 -07:00
rf.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
rf.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
rxtx.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
rxtx.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
srom.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
srom.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tcrc.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tcrc.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
test
tether.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tether.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tkip.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tkip.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
tmacro.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
TODO
ttype.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
upc.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
vntconfiguration.dat
vntwifi.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
vntwifi.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wcmd.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wcmd.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wctl.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wctl.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wmgr.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wmgr.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wpa2.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wpa2.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wpa.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wpa.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wpactl.c staging: vt6655: inherit addr_assign_type along with dev_addr 2013-09-03 20:57:50 -04:00
wpactl.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wroute.c staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00
wroute.h staging: vt6655: Remove unnecessary blank lines 2013-03-25 11:16:17 -07:00