summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-18staging: rtl8821ae: Fix code indent should use tabs where possibleGulsah Kose
Fix checkpatch.pl issues with code indent should use tabs where possible in base.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18drivers/staging/serqt_usb2:serqt_usb2.c Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issues with line over 80 characters in serqt_usb2.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18net: sched: use no more than one page in struct fw_headEric Dumazet
In commit b4e9b520ca5d ("[NET_SCHED]: Add mask support to fwmark classifier") Patrick added an u32 field in fw_head, making it slightly bigger than one page. Lets use 256 slots to make fw_hash() more straight forward, and move @mask to the beginning of the structure as we often use a small number of skb->mark. @mask and first hash buckets share the same cache line. This brings back the memory usage to less than 4000 bytes, and permits John to add a rcu_head at the end of the structure later without any worry. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Thomas Graf <tgraf@suug.ch> Cc: John Fastabend <john.fastabend@gmail.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18staging: wlags49_h2: Fix sparse warning for static declarationJelena Bjelja
Fix the following sparse warning: drivers/staging/wlags49_h2/wl_netdev.c:533:6: warning: symbol 'wl_poll' was not declared. Should it be static? Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: speakup: Prefer pr_err instead of printk(KERN_ERR)Keerthimai Janarthanan
Prefer pr_err instead of printk(KERN_ERR) Signed-off-by: Keerthimai Janarthanan <keerthimaipb@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Convert from printk into netdev_err or netdev_infoAna Rey
Convert from printk functions into netdev_err or netdev_info in ieee80211/dot11d.c Fix checkpatch.pl warning: WARNING: printk() should include KERN_ facility level WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Move export_symbol below its functionAna Rey
Move export_symbol below its function in ieee80211/dot11d.c Fix checkpatch.pl warning: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: fix coding style in function definitionAna Rey
Remove innecessary spaces and indentation errors in function definition Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Add whitespace in ieee80211/dot11d.cAna Rey
Add whitespace in ieee80211/dot11d.c and fix coding style these lines when It is necessary Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Delete unnecesary braces in ieee80211/dot11d.cAna Rey
Delete unnecesary braces and fix coding style these lines when It is necessary in ieee80211/dot11d.c Fix checkpatch.pl errors: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Move open brace on the previous lineAna Rey
Move open brace on the previous line and fix coding style in these lines when It is necessary in ieee80211/dot11d.c Fix checkpatch.pl errors: ERROR: that open brace { should be on the previous line Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Clean-up comment line style in ieee80211/dot11d.cAna Rey
Convert style of comments from C99-style to C89 and fix coding style in these lines when It is necessary. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8192u: Delete commented code in ieee80211/dot11d.cAna Rey
Delete all commented code in ieee80211/dot11d.c that are not necessary. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18Merge branch 'master' of ↵David S. Miller
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next Steffen Klassert says: ==================== One patch to rename a newly introduced struct. The rest is the rework of the IPsec virtual tunnel interface for ipv6 to support inter address family tunneling and namespace crossing. 1) Rename the newly introduced struct xfrm_filter to avoid a conflict with iproute2. From Nicolas Dichtel. 2) Introduce xfrm_input_afinfo to access the address family dependent tunnel callback functions properly. 3) Add and use a IPsec protocol multiplexer for ipv6. 4) Remove dst_entry caching. vti can lookup multiple different dst entries, dependent of the configured xfrm states. Therefore it does not make to cache a dst_entry. 5) Remove caching of flow informations. vti6 does not use the the tunnel endpoint addresses to do route and xfrm lookups. 6) Update the vti6 to use its own receive hook. 7) Remove the now unused xfrm_tunnel_notifier. This was used from vti and is replaced by the IPsec protocol multiplexer hooks. 8) Support inter address family tunneling for vti6. 9) Check if the tunnel endpoints of the xfrm state and the vti interface are matching and return an error otherwise. 10) Enable namespace crossing for vti devices. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18staging:rtl8192u: drop explicit externsHimangi Saraogi
This patch removes use of explicit extern specifier and quietens the sparse warnings: drivers/staging/rtl8192u/r8192U_dm.c:159:1: warning: function 'init_hal_dm' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:179:13: warning: function 'deinit_hal_dm' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:245:17: warning: function 'hal_dm_watchdog' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:278:13: warning: function 'init_rate_adaptive' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:878:17: warning: function 'dm_txpower_trackingcallback' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:1609:13: warning: function 'dm_cck_txpower_adjust' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:1776:13: warning: function 'dm_change_dynamic_initgain_thresh' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:1846:1: warning: function 'dm_change_fsync_setting' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:1863:1: warning: function 'dm_change_rxpath_selection_setting' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:2543:13: warning: function 'dm_init_edca_turbo' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:2663:13: warning: function 'DM_CTSToSelfSetting' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:2782:17: warning: function 'dm_rf_pathcheck_workitemcallback' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:3142:13: warning: function 'dm_fsync_timer_callback' with external linkage has definition drivers/staging/rtl8192u/r8192U_dm.c:3481:13: warning: function 'dm_shadow_init' with external linkage has definition Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: media: omap24xx: tcm825x.c Fix that open brace { should be on the ↵Aybuke Ozdemir
previous line The patch fixes the following checkpatch.pl errors: ERROR: that open brace { should be on the previous line. Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:media: Removed assignments from if statements.Chi Pham
The following coccinelle script found the match: @simple@ expression E1, E2; statement S1, S2; @@ + E1 = E2; if ( - (E1 = E2) + E1 ) S1 else S2 @left@ expression E0, E1, E2; statement S0, S1; @@ - if ((E1 = E2) < E0) + E1 = E2; + if (E1 < E0) S1 Signed-off-by: Chi Pham <fempsci@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: vt6656: Fix sparse warningsHimangi Saraogi
This patch fixes the following sparse warnings: drivers/staging/vt6656/aes_ccmp.c:272:32: warning: restricted __le16 degrades to integer drivers/staging/vt6656/aes_ccmp.c:274:32: warning: restricted __le16 degrades to integer drivers/staging/vt6656/aes_ccmp.c:282:32: warning: restricted __le16 degrades to integer Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:vt6655: Fix sparse warnings of using plain integer as NULL pointerHimangi Saraogi
This patch fixes the following sparse warnings: drivers/staging/vt6655/wmgr.c:970:42: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:971:41: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:972:38: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:973:43: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4110:37: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4111:41: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4112:34: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4113:30: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4114:35: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:4123:32: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:1815:41: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:1816:34: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:1817:30: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:1818:35: warning: Using plain integer as NULL pointer drivers/staging/vt6655/wmgr.c:2075:63: warning: Using plain integer as NULL pointer The following coccinelle script was used to achieve this: @rule1@ expression *x; @@ ( - x = 0; + x = NULL; | - (x == 0) + (x == NULL) | - (x != 0) + (x != NULL) ) Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:lustre: Removed assignments from if statements.Chi Pham
Fixed some minor checkpatch warnings such as whitespace. Coccinelle was used for this patch (NOTE: some of the changes were made by hand). The script is not complete (semantically) and might raise some checkpatch warnings in terms of indentation depending on existing code. *** IFASSIGNMENT.COCCI START *** /* Coccinelle script to handle assignments in if statements * For compound statements, can so far only handle statements with the * assignment on either extreme */ /* This rule is for simple cases * e.g. just an assignment in if, possibly with unary operator */ @simple@ expression E1, E2; statement S1, S2; @@ + E1 = E2; if ( - (E1 = E2) + E1 ) S1 else S2 /* This rule is for compound statements where the assignment is on the right.*/ @right@ expression E, E1, E2; statement S1, S2; @@ ( /* and */ - if (E && (E1 = E2)) + if (E) { + E1 = E2; + if (E1) S1 else S2 + } else S2 | - if (E && (E1 = E2)) + if (E) { + E1 = E2; + if (E1) S1 + } /* or */ | - if (E || (E1 = E2)) + if (!E) { + E1 = E2; + if (E1) S1 else S2 + } + else S1 | - if (E || (E1 = E2)) + if (!E) { + E1 = E2; + if (E1) S1 + } else S1 /* not equal */ | - if (E != (E1 = E2)) + E1 = E2; + if (E != E1) S1 else S2 | - if (E != (E1 = E2)) + E1 = E2; + if (E != E1) S1 /* equal */ | - if (E == (E1 = E2)) + E1 = E2; + if (E == E1) S1 else S2 | - if (E == (E1 = E2)) + E1 = E2; + if (E == E1) S1 /* greater than */ | - if (E > (E1 = E2)) + E1 = E2; + if (E > E1) S1 else S2 | - if (E > (E1 = E2)) + E1 = E2; + if (E > E1) S1 /* less than */ | - if (E < (E1 = E2)) + E1 = E2; + if (E < E1) S1 else S2 | - if (E < (E1 = E2)) + E1 = E2; + if (E < E1) S1 /* lesser than or equal to */ | - if (E <= (E1 = E2)) + E1 = E2; + if (E <= E1) S1 else S2 | - if (E <= (E1 = E2)) + E1 = E2; + if (E <= E1) S1 /* greater than or equal to */ | - if (E >= (E1 = E2)) + E1 = E2; + if (E >= E1) S1 else S2 | - if (E >= (E1 = E2)) + E1 = E2; + if (E >= E1) S1 ) /* This rule is for compound statements where the assignment is on the left.*/ @left@ expression E, E1, E2; statement S1, S2; @@ ( /* and */ - if ((E1 = E2) && E) + E1 = E2; + if (E1 && E) S1 else S2 | - if ((E1 = E2) && E) + E1 = E2; + if (E1 && E) S1 | /* or */ - if ((E1 = E2) || E) + E1 = E2; + if (E1 || E) S1 | - if ((E1 = E2) || E) + E1 = E2; + if (E1 || E) S1 else S2 | /* not equal */ - if ((E1 = E2) != E) + E1 = E2; + if (E1 != E) S1 | - if ((E1 = E2) != E) + E1 = E2; + if (E1 != E) S1 else S2 | /* equal */ - if ((E1 = E2) == E) + E1 = E2; + if (E1 == E) S1 | - if ((E1 = E2) == E) + E1 = E2; + if (E1 == E) S1 else S2 | /* greater */ - if ((E1 = E2) > E) + E1 = E2; + if (E1 > E) S1 | - if ((E1 = E2) > E) + E1 = E2; + if (E1 > E) S1 else S2 | /* less */ - if ((E1 = E2) < E) + E1 = E2; + if (E1 < E) S1 | - if ((E1 = E2) < E) + E1 = E2; + if (E1 < E) S1 else S2 /* lesser than or equal to */ - if ((E1 = E2) <= E) + E1 = E2; + if (E1 <= E) S1 | - if ((E1 = E2) <= E) + E1 = E2; + if (E1 <= E) S1 else S2 /* greater than or equal to */ - if ((E1 = E2) >= E) + E1 = E2; + if (E1 >= E) S1 | - if ((E1 = E2) >= E) + E1 = E2; + if (E1 >= E) S1 else S2 ) *** IFASSIGNMENT.COCCI END *** Signed-off-by: Chi Pham <fempsci@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18drivers/staging/dgrp:dgrp_tty.c: Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issues with line over 80 characters in dgrp_tty.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: nokia_h4p: move firmware macros to firmware partKristina Martšenko
As the TODO file suggests, move firmware file macros from the header file to the file that deals with firmware. In the process also move MODULE_FIRMWARE() instances to the same file. Remove the relevant item from the TODO file. Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: nokia_h4p: Fix line over 80 characters.Gulsah Kose
Fix checkpatch.pl issues with line over 80 characters in nokia_core.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:rtl8188eu: Remove unnecessary variable assignmentsHimangi Saraogi
This patch removes unnecessary variable assignments which are assigned immediately after the first initialization. Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:rtl8188eu: Removed assignments in if statements.Chi Pham
Fixed some indentation to silence (some) checkpatch errors. The following coccinelle script found the match: @@ expression E0, E1, E2; statement S0, S1; @@ - if ((E1 = E2) != E) + E1 = E2; + if (E1 != E) S1 else S2 Signed-off-by: Chi Pham <fempsci@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18Staging: rtl8188eu: Replace rtw_zmalloc with kzalloc.Elena Oat
This patch replaces rtw_zmalloc with kzalloc in function rtw_setstandby_cmd. There are no locks, hence GFP_KERNEL flag is used. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: cxt1e1: Fix Sparse Warning for Static Declarations in linux.cHimangi Saraogi
This patch fixes the following sparse warnings: drivers/staging/cxt1e1/linux.c:106:13: warning: symbol 'log_level_default' was not declared. Should it be static? drivers/staging/cxt1e1/linux.c:110:13: warning: symbol 'max_mru_default' was not declared. Should it be static? drivers/staging/cxt1e1/linux.c:255:1: warning: symbol 'c4_linux_interrupt' was not declared. Should it be static? drivers/staging/cxt1e1/linux.c:265:1: warning: symbol 'c4_ebus_interrupt' was not declared. Should it be static? Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: cxt1e1: Fix do not use // c99 commentsGulsah Kose
This patch fixes "do not use // C99 comments" errors in linux.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: cxt1e1: Fix line over 80 characters.Gulsah Kose
Fix checkpatch.pl issues with line over 80 characters in comet.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: octeon: octeon-ethernet.h Fix Unnecessary space after function ↵Aybuke Ozdemir
pointer name The patch fixes the following checkpatch.pl warnings: WARNING: Unnecessary space after function pointer name. Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18spi: remove obsolete spi-ti-ssp driverArnd Bergmann
The tnetv107x platform is getting removed, so this driver will not be needed any more. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-18net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation ↵Or Gerlitz
feature mask The networking core does it for the driver during registration time. Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookupEric W Biederman
When compiling the i40e and the i40evf driver into the same kernel I get: LD drivers/net/ethernet/intel/built-in.o drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x300): multiple definition of `i40e_ptype_lookup' drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x780): first defined here make[3]: *** [drivers/net/ethernet/intel/built-in.o] Error 1 make[2]: *** [drivers/net/ethernet/intel] Error 2 make[1]: *** [drivers/net/ethernet/] Error 2 make: *** [sub-make] Error 2 Fix this by renaming the i40evf version of this structure from i40e_ptype_lookup to i40evf_ptype_lookup. This build failure was introduced in: commit 206812b5fccb808d1194344eaa942f68f59b2630 Author: Jesse Brandeburg <jesse.brandeburg@intel.com> i40e/i40evf: i40e implementation for skb_set_hash Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Eric W Biederman <ebiederm@xmission.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18e1000e: fix the build error when PM is disabledKevin Hao
The commit 2800209994f8 (e1000e: Refactor PM flows) changed the SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to protect them with CONFIG_PM_SLEEP. Then cause the following build error when PM is disabled: drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function) .suspend = e1000e_pm_suspend, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function) .resume = e1000e_pm_resume, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function) .thaw = e1000e_pm_thaw, ^ Signed-off-by: Kevin Hao <haokexin@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18igb: remove references to long gone command line parametersFernando Luis Vazquez Cao
Command line parameters QueuePairs, Node, EEE, DMAC and InterruptThrottleRate do not exist these days. Remove all references to them in the Documentation folder and update code comments. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-18Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg
The pairing process initiated through mgmt sets the conn->auth_type value regardless of BR/EDR or LE pairing. This value will contain the MITM flag if the local IO capability allows it. When sending the SMP pairing request we should check the value and ensure that the MITM bit gets correctly set in the bonding flags. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2014-03-18Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg
The SMP specification is written with the assumption that both key information, plaintextData and encryptedData follow the same little endian byte ordering as the rest of SMP. Since the kernel crypto routines expect big endian data the code has had to do various byte swapping tricks to make the behavior as expected, however the swapping has been scattered all around the place. This patch centralizes the byte order swapping into the smp_e function by making its public interface match what the other SMP functions expect as per specification. The benefit is vastly simplified calls to smp_e. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2014-03-18Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg
To make it possible to (correctly) pass data declared as const as the src parameter to the swap56 and swap128 functions declare this parameter also as const. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2014-03-18staging: rtl8187se: Clean-up comment line style in r8180_rtl8225.hAna Rey
This patch clean-up comment-line style in r8180_rtl8225.h as the CodingStyle recommends. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Delete commented code and whitelineAna Rey
Delete all commented code and whitelines in ieee80211/ieee80211_crypt_wep.c that are not necessary. Fix sparse warnings: ERROR: do not use C99 // comments Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Delete unnecessary comment in r8180_core.cAna Rey
Delete unnecessary comments in r8180_core.c Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Use min_t instead of minAna Rey
Use min_t instead of min function in ieee80211/ieee80211_wx.c Fix sparse warnings: WARNING: min() should probably be min_t(u8, network->ssid_len, 32) Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Use ether_addr_copy functionAna Rey
Use ether_addr_copy instead of memcpy function for fast copy an Ethernet address in ieee80211/ieee80211_wx.c Fixes sparse warnings: WARNING: Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2) Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Convert from printk into netdev_err or netdev_infoAna Rey
Convert from printk functions into netdev_err or netdev_info. Fix checkpatch.pl warning: WARNING: printk() should include KERN_ facility level Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Fix indent in switch statement.Ana Rey
Fix indent in switch statement in ieee80211/ieee80211_wx.c. Fix checkpatch.pl error: ERROR: switch and case should be at the same indent. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Fix commend lineAna Rey
Fix commend line in ieee80211/ieee80211_wx.c as the codingStyle of the kernel recommends. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: rtl8187se: Delete commented codeAna Rey
Delete all commented code in ieee80211/ieee80211_wx.c that are not necessary. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18Staging: rtl8187se: Fix warning symbol should be staticAndreea-Cristina Bernat
This patch solves the sparse warning: "symbol 'ieee80211_ccmp_aes_encrypt' was not declared. Should it be static?" Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging:rtl8187se: Fix sparse warning restricted __le16 degrades to integerHimangi Saraogi
This patch fixes the following sparse warning in r8180_core.c - warning: restricted __le16 degrades to integer. Also, the variable morefrag is changed to bool as it is being used as a bool. Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Reviewed-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18staging: iio: light: Checkpatch fixes tsl2x7x_core.cAybuke Ozdemir
This patch fixes these errors and warning messages found by checkpatch.pl: ERROR: return is not a function, parentheses are not required. WARNING: space prohibited before semicolon. Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>