aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-053-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * staging: vt6655: inherit addr_assign_type along with dev_addrBjørn Mork2013-09-033-3/+3
| | | | | | | | | | | | | | | | | | | | A device inheriting a random or set address should reflect this in its addr_assign_type. Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Bjørn Mork <bjorn@mork.no> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | vt6655/trivial: replace numeric with standard PM state macrosYijing Wang2013-07-261-2/+2
|/ | | | | | | | | | | | | Use standard PM state macros PCI_Dx instead of numeric 0/1/2.. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Forest Bond <forest@alittletooquiet.net> Cc: Jiri Kosina <trivial@kernel.org> Cc: Devendra Naga <devendra.aaru@gmail.com> Cc: Joe Perches <joe@perches.com> Cc: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: aes_ccmp: fixed a brace coding styleJohn B. Wyatt IV2013-06-241-3/+2
| | | | | | | Fixed a coding style issue. Signed-off-by: John B. Wyatt IV <sageofredondo@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: info leak in ioctlDan Carpenter2013-06-241-4/+5
| | | | | | | | | | | | | The SCmdLinkStatus struct has a couple holes. There is one between ->bLink and ->wBSSType, and another between ->abySSID and ->uChannel. I've added a memset() to initialize the struct to zero. Since we don't need to clear abySSID any more so I've removed that memset. It was wrong anyway: abySSID has "SSID_MAXLEN + 2" (34) bytes, not "WLAN_SSID_MAXLEN + 1" (33). Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: add missing free_netdev() on error in hostap_enable_hostapd()Wei Yongjun2013-05-301-0/+2
| | | | | | | | | Add the missing free_netdev() before return from function hostap_enable_hostapd() in the error handling case. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: Use alloc_etherdev() for kzallocHema Prathaban2013-05-171-1/+1
| | | | | | | | Use alloc_etherdev() for kzalloc Signed-off-by: Hema Prathaban <hemaklnce@gmail.com> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211hdr.hTülin İzer2013-05-161-1/+1
| | | | | | | | This patch fixes ERROR: do not use C99 // comments found by checkpatch in vt6655/80211hdr.h. Signed-off-by: Tülin İzer <tulinizer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/aes_ccmp.h.Tülin İzer2013-05-161-1/+1
| | | | | | | | This patch fixes ERROR: do not use C99 // comments found by checkpatch in vt6655/aes_ccmp.c. Signed-off-by: Tülin İzer <tulinizer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/aes_ccmp.cTülin İzer2013-05-161-16/+16
| | | | | | | | This patch fixes ERROR: do not use C99 // comments found by checkpatch in vt6655/aes_ccmp.c. Signed-off-by: Tülin İzer <tulinizer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211mgr.hTülin İzer2013-05-161-58/+49
| | | | | | | | This patch fixes ERROR: do not use C99 // comments found by checkpatch.pl in vt6655/80211mgr.c Signed-off-by: Tülin İzer <tulinizer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: vt6655: Fixed ERROR: do not use C99 // comments in 80211mgr.cTülin İzer2013-05-161-36/+36
| | | | | | | This patch fixes ERROR: do not use C99 // comments in vt6655/802mgr.c Signed-off-by: Tülin İzer <tulinizer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: use free_netdev instead of kfreeHema Prathaban2013-05-161-1/+1
| | | | | | | Use free_netdev() instead of kfree() Signed-off-by: Hema Prathaban <hemaklnce@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2013-05-011-53/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull VFS updates from Al Viro, Misc cleanups all over the place, mainly wrt /proc interfaces (switch create_proc_entry to proc_create(), get rid of the deprecated create_proc_read_entry() in favor of using proc_create_data() and seq_file etc). 7kloc removed. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits) don't bother with deferred freeing of fdtables proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h proc: Make the PROC_I() and PDE() macros internal to procfs proc: Supply a function to remove a proc entry by PDE take cgroup_open() and cpuset_open() to fs/proc/base.c ppc: Clean up scanlog ppc: Clean up rtas_flash driver somewhat hostap: proc: Use remove_proc_subtree() drm: proc: Use remove_proc_subtree() drm: proc: Use minor->index to label things, not PDE->name drm: Constify drm_proc_list[] zoran: Don't print proc_dir_entry data in debug reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show() proc: Supply an accessor for getting the data from a PDE's parent airo: Use remove_proc_subtree() rtl8192u: Don't need to save device proc dir PDE rtl8187se: Use a dir under /proc/net/r8180/ proc: Add proc_mkdir_data() proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h} proc: Move PDE_NET() to fs/proc/proc_net.c ...
| * vt6655: slightly clean reading config fileAl Viro2013-04-091-75/+40
| | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | staging: vt6655: Remove unnecessary blank linesJoe Perches2013-03-2569-1557/+0
| | | | | | | | | | | | | | | | | | | | Remove a bunch of useless vertical whitespace. Convert 3 or more consecutive newlines to 2. Remove blank lines after open brace and before close brace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: vt6655: Fix macro definitionsJoe Perches2013-03-255-401/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Macros should be able to be used in if/else without braces. Convert macros to use do {} while (0) instead of bare braces where appropriate. Convert macros to use single line macro definitions where appropriate. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: vt6655: Remove commented out if()sJoe Perches2013-03-2511-136/+2
| | | | | | | | | | | | | | Commented out code is just noise. Remove them. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: vt6655: Remove unnecessary parentheses from returnsJoe Perches2013-03-2515-138/+138
| | | | | | | | | | | | | | | | Returns aren't functions, remove the parentheses to be more kernel style like. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: vt6655: Convert to kernel brace styleJoe Perches2013-03-2524-707/+357
| | | | | | | | | | | | | | Move braces around to be more kernel like. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: vt6655: Remove commented out printksJoe Perches2013-03-2512-130/+6
| | | | | | | | | | | | | | These are just noise in the code so remove them. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wroute: Whitespace cleanupsJoe Perches2013-03-182-129/+129
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wpactl: Whitespace cleanupsJoe Perches2013-03-182-435/+435
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wpa2: Whitespace cleanupsJoe Perches2013-03-182-266/+266
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wpa: Whitespace cleanupsJoe Perches2013-03-182-178/+178
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wmgr: Whitespace cleanupsJoe Perches2013-03-182-4301/+4301
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wctl: Whitespace cleanupsJoe Perches2013-03-182-158/+158
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:wcmd: Whitespace cleanupsJoe Perches2013-03-182-921/+921
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:vntwifi: Whitespace cleanupsJoe Perches2013-03-182-582/+582
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:upc: Whitespace cleanupsJoe Perches2013-03-181-68/+68
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:ttype: Whitespace cleanupsJoe Perches2013-03-181-6/+6
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:tkip: Whitespace cleanupsJoe Perches2013-03-182-170/+170
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:tether: Whitespace cleanupsJoe Perches2013-03-182-40/+40
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:tcrc: Whitespace cleanupsJoe Perches2013-03-181-78/+78
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:srom: Whitespace cleanupsJoe Perches2013-03-182-156/+156
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:rxtx: Whitespace cleanupsJoe Perches2013-03-182-2852/+2852
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:rf: Whitespace cleanupsJoe Perches2013-03-182-739/+739
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:rc4: Whitespace cleanupsJoe Perches2013-03-182-42/+42
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:power: Whitespace cleanupsJoe Perches2013-03-182-249/+249
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:michael: Whitespace cleanupsJoe Perches2013-03-182-86/+86
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:mib: Whitespace cleanupsJoe Perches2013-03-182-600/+600
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:mac: Whitespace cleanupsJoe Perches2013-03-182-1234/+1234
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:key: Whitespace cleanupsJoe Perches2013-03-182-664/+664
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:iwctl: Whitespace cleanupsJoe Perches2013-03-182-1185/+1185
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:iowpa: Whitespace cleanupsJoe Perches2013-03-181-21/+21
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:ioctl: Whitespace cleanupsJoe Perches2013-03-182-14/+14
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:iocmd: Whitespace cleanupsJoe Perches2013-03-181-100/+100
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:hostap: Whitespace cleanupsJoe Perches2013-03-181-333/+333
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:dpc: Whitespace cleanupsJoe Perches2013-03-182-1224/+1224
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging:vt6655:device_main: Whitespace cleanupsJoe Perches2013-03-181-2408/+2408
| | | | | | | | | | | | | | | | Neatening only. git diff -w shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>