There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ERROR: do not use C99 // comments
+ volatile u_char radioModule;// shows EEPROM, can be overridden at 0x111
ERROR: do not use C99 // comments
+ volatile u_char defaultChannelSet; // shows EEProm, can be overriiden at 0x10A
Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ERROR: trailing whitespace
+ * Copyright (C) 1998 Elmer.Joandi@ut.ee, +37-255-13500^I$
WARNING: Use #include <linux/io.h> instead of <asm/io.h>
+#include <asm/io.h>
ERROR: do not use C99 // comments
+//#define ARLAN_DEBUGGING 1
ERROR: "foo * bar" should be "foo *bar"
+extern int arlan_command(struct net_device * dev, int command);
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+#define IFDEBUG( L ) if ( (L) & arlan_debug ) $
ERROR: space prohibited after that open parenthesis '('
+#define IFDEBUG( L ) if ( (L) & arlan_debug )
ERROR: space prohibited before that close parenthesis ')'
+#define IFDEBUG( L ) if ( (L) & arlan_debug )
ERROR: trailing whitespace
+#define ARLAN_FAKE_HDR_LEN 12 $
ERROR: space required after that ',' (ctx:VxV)
+ #define ARLAN_DEBUG(a,b) printk(KERN_DEBUG a, b)
^
ERROR: trailing whitespace
+^I#define ARLAN_DEBUG(a,b) $
ERROR: space required after that ',' (ctx:VxV)
+ #define ARLAN_DEBUG(a,b)
^
ERROR: open brace '{' following struct go on the same line
+struct arlan_shmem
+{
ERROR: trailing whitespace
+ /* Header Signature */ $
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+ int systemId; $
ERROR: open brace '{' following struct go on the same line
+struct TxParam
+{
ERROR: "foo * bar" should be "foo *bar"
+ struct arlan_shmem __iomem * card;
ERROR: "foo * bar" should be "foo *bar"
+ struct arlan_shmem * conf;
ERROR: trailing whitespace
+ struct arlan_conf_stru * Conf;^I $
ERROR: "foo * bar" should be "foo *bar"
+ struct arlan_conf_stru * Conf;
ERROR: trailing whitespace
+ $
ERROR: space required after that ',' (ctx:VxV)
+#define READSHM(to,from,atype) {\
^
ERROR: space required after that ',' (ctx:VxV)
+#define READSHM(to,from,atype) {\
^
ERROR: space required after that ',' (ctx:VxO)
+ memcpy_fromio(&(tmp),&(from),sizeof(atype));\
^
ERROR: space required before that '&' (ctx:OxV)
+ memcpy_fromio(&(tmp),&(from),sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+ memcpy_fromio(&(tmp),&(from),sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+#define READSHMEM(from,atype)\
^
ERROR: space required after that ',' (ctx:VxV)
+#define WRITESHM(to,from,atype) \
^
ERROR: space required after that ',' (ctx:VxV)
+#define WRITESHM(to,from,atype) \
^
ERROR: space required after that ',' (ctx:VxO)
+ memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
^
ERROR: space required before that '&' (ctx:OxV)
+ memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+ memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
^
ERROR: space required after that ',' (ctx:VxV)
+#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
^
ERROR: space required after that ',' (ctx:VxV)
+#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
^
ERROR: space required after that ',' (ctx:VxO)
+ memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
^
ERROR: space required before that '&' (ctx:OxV)
+ memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+ memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
^
ERROR: space required after that ',' (ctx:VxV)
+ IFDEBUG(levelSHM) printk(stringSHM,tmpSHM);\
^
ERROR: space required after that ',' (ctx:VxO)
+ writeb(val,&(to))
^
ERROR: space required before that '&' (ctx:OxV)
+ writeb(val,&(to))
^
ERROR: space required after that ',' (ctx:VxO)
+ writew(val,&(to))
^
ERROR: space required before that '&' (ctx:OxV)
+ writew(val,&(to))
^
ERROR: space required after that ',' (ctx:VxO)
+ writel(val,&(to))
^
ERROR: space required before that '&' (ctx:OxV)
+ writel(val,&(to))
^
ERROR: space prohibited after that open parenthesis '('
+ ( ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode) > 0) && \
ERROR: space prohibited after that open parenthesis '('
+ ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) )
ERROR: space prohibited before that close parenthesis ')'
+ ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) )
ERROR: code indent should use tabs where possible
+ ^IREADSHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage)$
ERROR: space required before the open brace '{'
+#define writeControlRegister(dev, v){\
ERROR: space required after that ',' (ctx:WxV)
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\
^
ERROR: need consistent spacing around '&' (ctx:WxV)
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\
^
ERROR: space prohibited before that close parenthesis ')'
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\
ERROR: space required after that ',' (ctx:WxV)
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );}
^
ERROR: space required after that ';' (ctx:VxV)
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );}
^
ERROR: space prohibited before that close parenthesis ')'
+ WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );}
WARNING: suspect code indent for conditional statements (3, 6)
+ if (cr & ARLAN_CHANNEL_ATTENTION){ \
+ writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
ERROR: space required before the open brace '{'
+ if (cr & ARLAN_CHANNEL_ATTENTION){ \
ERROR: space required after that close brace '}'
+ }else \
ERROR: space required before the open brace '{'
+#define clearChannelAttention(dev){ \
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);}
^
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);}
^
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);}
^
ERROR: space required before the open brace '{'
+#define setInterruptEnable(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;}
^
ERROR: space required after that ';' (ctx:WxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;}
^
ERROR: space required before the open brace '{'
+#define clearInterruptEnable(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;}
^
ERROR: space required after that ';' (ctx:WxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;}
^
ERROR: space required before the open brace '{'
+#define setClearInterrupt(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;}
^
ERROR: space required after that ';' (ctx:WxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;}
^
ERROR: space required before the open brace '{'
+#define clearClearInterrupt(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);}
^
ERROR: space required before the open brace '{'
+#define setPowerOff(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | (ARLAN_POWER && ARLAN_ACCESS));\
^
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
^
ERROR: space required before the open brace '{'
+#define setPowerOn(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~(ARLAN_POWER)); }
^
ERROR: space required before the open brace '{'
+#define arlan_lock_card_access(dev){\
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
^
ERROR: space required after that ';' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
^
ERROR: space required before the open brace '{'
+#define arlan_unlock_card_access(dev){\
ERROR: trailing whitespace
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } $
ERROR: space required after that ',' (ctx:VxV)
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); }
^
ERROR: space prohibited before that close parenthesis ')'
+ writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); }
ERROR: trailing whitespace
+ $
ERROR: trailing whitespace
+ $
Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
removed needless checks in arlan-main.c and slicoss.c
fixed bug in et131x_netdev.c to actually fill addresses in.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
mac80211: fix reorder buffer release
iwmc3200wifi: Enable wimax core through module parameter
iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
iwmc3200wifi: Coex table command does not expect a response
iwmc3200wifi: Update wiwi priority table
iwlwifi: driver version track kernel version
iwlwifi: indicate uCode type when fail dump error/event log
iwl3945: remove duplicated event logging code
b43: fix two warnings
ipw2100: fix rebooting hang with driver loaded
cfg80211: indent regulatory messages with spaces
iwmc3200wifi: fix NULL pointer dereference in pmkid update
mac80211: Fix TX status reporting for injected data frames
ath9k: enable 2GHz band only if the device supports it
airo: Fix integer overflow warning
rt2x00: Fix padding bug on L2PAD devices.
WE: Fix set events not propagated
b43legacy: avoid PPC fault during resume
b43: avoid PPC fault during resume
tcp: fix a timewait refcnt race
...
Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
kernel/sysctl_check.c
net/ipv4/sysctl_net_ipv4.c
net/ipv6/addrconf.c
net/sctp/sysctl.c
These wireless drivers in staging could be built when
CONFIG_NET=n, CONFIG_NETDEVICES=n, causing this build error:
net/wireless/wext-priv.c: In function 'ioctl_private_call':
net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'
due to faulty selects.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Move the arlan driver to drivers/staging. This is another pre-802.11
driver that has seen virtually no non-API-fixup activity in years, and
for which no active hardware is likely to still exist. This driver
represents unnecessary ongoing maintenance for no clear benefit.
This patch brought to you by the "hacking" session at the 2009 Kernel
Summit in Tokyo, Japan...
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Greg Kroah-Hartman
Andrea Gelmini
Jiri Pirko
Linus Torvalds
Randy Dunlap
John W. Linville