1. 29 8月, 2009 3 次提交
  2. 20 8月, 2009 1 次提交
    • R
      ipw2x00: fix sparse warnings · 21f8a73f
      Reinette Chatre 提交于
      This fixes:
      
        CHECK   drivers/net/wireless/ipw2x00/ipw2100.c
      drivers/net/wireless/ipw2x00/ipw2100.c:7888:22: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:188:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2100.c:7952:18: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:188:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2100.c:8000:18: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:188:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: originally declared here
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: originally declared here
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2100.c:8268:27: originally declared here
        CC [M]  drivers/net/wireless/ipw2x00/ipw2100.o
        CHECK   drivers/net/wireless/ipw2x00/ipw2200.c
      drivers/net/wireless/ipw2x00/ipw2200.c:847:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:891:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:935:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:980:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:1016:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:1051:13: warning: symbol 'led' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:92:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:1823:13: warning: symbol 'channel' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:86:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min1' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: warning: symbol '_min2' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:4268:19: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:6228:28: warning: symbol 'channel' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:86:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:6369:20: warning: symbol 'channel' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:86:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:6857:12: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:87:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:7964:13: warning: symbol 'channel' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:86:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:8720:12: warning: symbol 'channel' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:86:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:9662:13: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:87:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:9720:13: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:87:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:9826:13: warning: symbol 'mode' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:87:12: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:10318:21: warning: symbol 'remaining_bytes' shadows an earlier one
      drivers/net/wireless/ipw2x00/ipw2200.c:10184:13: originally declared here
      drivers/net/wireless/ipw2x00/ipw2200.c:8338:45: warning: cast to restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:4414:21: warning: incorrect type in assignment (different base types)
      drivers/net/wireless/ipw2x00/ipw2200.c:4414:21:    expected restricted __le16 [usertype] size
      drivers/net/wireless/ipw2x00/ipw2200.c:4414:21:    got unsigned short [unsigned] [usertype] <noident>
      drivers/net/wireless/ipw2x00/ipw2200.c:6105:33: warning: incorrect type in initializer (different base types)
      drivers/net/wireless/ipw2x00/ipw2200.c:6105:33:    expected restricted __le16 [usertype] tx_rates
      drivers/net/wireless/ipw2x00/ipw2200.c:6105:33:    got unsigned short [unsigned] [usertype] rates_mask
      drivers/net/wireless/ipw2x00/ipw2200.c:6124:29: warning: bad assignment (>>=) to restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:6130:31: warning: restricted __le16 degrades to integer
      drivers/net/wireless/ipw2x00/ipw2200.c:6140:23: warning: restricted __le16 degrades to integer
      drivers/net/wireless/ipw2x00/ipw2200.c:6149:54: warning: restricted __le16 degrades to integer
      drivers/net/wireless/ipw2x00/ipw2200.c:6151:37: warning: invalid assignment: &=
      drivers/net/wireless/ipw2x00/ipw2200.c:6151:37:    left side has type restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:6151:37:    right side has type int
      drivers/net/wireless/ipw2x00/ipw2200.c:6154:54: warning: restricted __le16 degrades to integer
      drivers/net/wireless/ipw2x00/ipw2200.c:6156:37: warning: invalid assignment: &=
      drivers/net/wireless/ipw2x00/ipw2200.c:6156:37:    left side has type restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:6156:37:    right side has type int
      drivers/net/wireless/ipw2x00/ipw2200.c:6159:55: warning: restricted __le16 degrades to integer
      drivers/net/wireless/ipw2x00/ipw2200.c:6161:37: warning: invalid assignment: &=
      drivers/net/wireless/ipw2x00/ipw2200.c:6161:37:    left side has type restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:6161:37:    right side has type int
      drivers/net/wireless/ipw2x00/ipw2200.c:6164:29: warning: invalid assignment: |=
      drivers/net/wireless/ipw2x00/ipw2200.c:6164:29:    left side has type restricted __le16
      drivers/net/wireless/ipw2x00/ipw2200.c:6164:29:    right side has type unsigned short
      drivers/net/wireless/ipw2x00/ipw2200.c:7853:29: warning: incorrect type in assignment (different base types)
      drivers/net/wireless/ipw2x00/ipw2200.c:7853:29:    expected signed char [signed] [usertype] [explicitly-signed] rt_dbmnoise
      drivers/net/wireless/ipw2x00/ipw2200.c:7853:29:    got restricted __le16 [usertype] noise
      drivers/net/wireless/ipw2x00/ipw2200.c:7967:25: warning: incorrect type in initializer (different base types)
      drivers/net/wireless/ipw2x00/ipw2200.c:7967:25:    expected signed char [signed] [usertype] [explicitly-signed] noise
      drivers/net/wireless/ipw2x00/ipw2200.c:7967:25:    got restricted __le16 [usertype] noise
      Signed-off-by: NReinette Chatre <reinette.chatre@intel.com>
      Cc: Zhu Yi <yi.zhu@intel.com>
      Acked-by: NZhu Yi <yi.zhu@intel.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      21f8a73f
  3. 08 8月, 2009 1 次提交
  4. 25 7月, 2009 1 次提交
  5. 11 7月, 2009 1 次提交
  6. 13 6月, 2009 1 次提交
    • P
      net: fix network drivers ndo_start_xmit() return values (part 3) · 4153e775
      Patrick McHardy 提交于
      net: fix network drivers ndo_start_xmit() return values (part 3)
      
      Fix up wireless drivers that return an errno value to qdisc_restart(), causing
      qdisc_restart() to print a warning an requeue/retransmit the skb.
      
      - airo: transmission not implemented for chip, intention is to free and abort
      - ipw2200: transmission not implemented for promiscous mode, intention is to
                 drop
      - prism54: intention is to drop
      - wl3501_cs: intention appears to be to drop
      - zd1201: error counter indicates intention is to drop
      
      All drivers compile tested.
      Signed-off-by: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4153e775
  7. 07 5月, 2009 1 次提交
  8. 14 4月, 2009 1 次提交
  9. 07 4月, 2009 1 次提交
  10. 30 3月, 2009 2 次提交
  11. 22 3月, 2009 2 次提交
  12. 28 2月, 2009 2 次提交
    • D
      ipw2x00: age scan results on resume · c3d72b96
      Dan Williams 提交于
      Scanned BSS entries are timestamped with jiffies, which doesn't
      increment across suspend and hibernate.  On resume, every BSS in the
      scan list looks like it was scanned within the last 10 seconds,
      irregardless of how long the machine was actually asleep.  Age scan
      results on resume with the time spent during sleep so userspace has a
      clue how old they really are.
      Signed-off-by: NDan Williams <dcbw@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      c3d72b96
    • J
      ipw2200, fix ipw io functions · 1788bcd1
      Jiri Slaby 提交于
      - some of them are defined as follows:
        #define ipw_write32	expr1; expr2
        and are called from loops or ifs without a compound statement, so
        they are broken. Fix it by putting them into do {} while (0) for
        writes and ({ }) for reads.
      - also unify and cleanup them while at it -- convert them from
        macros to inline functions, so that we get some basic typechecking
      Signed-off-by: NJiri Slaby <jirislaby@gmail.com>
      Acked-by: NZhu Yi <yi.zhu@intel.com>
      Cc: James Ketrenos <jketreno@linux.intel.com>
      Cc: Reinette Chatre <reinette.chatre@intel.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      1788bcd1
  13. 10 2月, 2009 1 次提交
  14. 13 12月, 2008 1 次提交
    • H
      ipw2200: fix scanning while associated · 14a4dfe2
      Helmut Schaa 提交于
      This patch fixes sporadic firmware restarts when scanning while associated.
      
      The firmware will quietly cancel a scan (while associated) if the dwell time
      for a channel to be scanned is larger than the time it may stay away from the
      operating channel (because of DTIM catching). Unfortunately the driver is not
      notified about the canceled scan and therefore the scan watchdog timeout will
      be hit and the driver causes a firmware restart which results in
      disassociation. This mainly happens on passive channels which use a dwell time
      of 120 whereas a typical beacon interval is around 100.
      
      The patch changes the dwell time for passive channels to be slightly smaller
      than the actual beacon interval to work around the firmware issue. Furthermore
      the number of allowed beacon misses is increased from one to three as otherwise
      most scans (while associated) won't complete successfully.
      
      However scanning while associated will still fail in corner cases such as a
      beacon intervals below 30.
      Signed-off-by: NHelmut Schaa <helmut.schaa@googlemail.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      14a4dfe2
  15. 05 12月, 2008 1 次提交
  16. 22 11月, 2008 3 次提交
  17. 01 11月, 2008 5 次提交
  18. 31 10月, 2008 1 次提交
  19. 28 10月, 2008 1 次提交
  20. 18 8月, 2008 1 次提交
    • H
      removed unused #include <version.h> · 3eb75aac
      Huang Weiyi 提交于
      The drivers below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.
        drivers/net/wireless/ath5k/base.c
        drivers/net/wireless/b43/main.c
        drivers/net/wireless/ipw2100.c
        drivers/net/wireless/ipw2200.c
        drivers/net/wireless/iwlwifi/iwl-3945.c
        drivers/net/wireless/iwlwifi/iwl-4965.c
        drivers/net/wireless/iwlwifi/iwl-5000.c
        drivers/net/wireless/iwlwifi/iwl-agn.c
        drivers/net/wireless/iwlwifi/iwl-core.c
        drivers/net/wireless/iwlwifi/iwl-eeprom.c
        drivers/net/wireless/iwlwifi/iwl-hcmd.c
        drivers/net/wireless/iwlwifi/iwl-power.c
        drivers/net/wireless/iwlwifi/iwl3945-base.c
      
      This patch removes the said #include <version.h>.
      Signed-off-by: NHuang Weiyi <weiyi.huang@gmail.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      3eb75aac
  21. 02 8月, 2008 2 次提交
  22. 23 7月, 2008 1 次提交
  23. 10 6月, 2008 1 次提交
    • D
      ipw2200: queue direct scans · ea177305
      Dan Williams 提交于
      When another scan is in progress, a direct scan gets dropped on the
      floor.  However, that direct scan is usually the scan that's really
      needed by userspace, and gets stomped on by all the broadcast scans the
      ipw2200 driver issues internally.  Make sure the direct scan happens
      eventually, and as a bonus ensure that the passive scan worker is
      cleaned up when appropriate.
      
      The change of request_passive_scan form a struct work to struct
      delayed_work is only to make the set_wx_scan() code a bit simpler, it's
      still only used with a delay of 0 to match previous behavior.
      Signed-off-by: NDan Williams <dcbw@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      ea177305
  24. 05 6月, 2008 1 次提交
  25. 17 5月, 2008 1 次提交
  26. 09 4月, 2008 1 次提交
    • D
      [NET]: Undo code bloat in hot paths due to print_mac(). · 21f644f3
      David S. Miller 提交于
      If print_mac() is used inside of a pr_debug() the compiler
      can't see that the call is redundant so still performs it
      even of pr_debug() ends up being a nop.
      
      So don't use print_mac() in such cases in hot code paths,
      use MAC_FMT et al. instead.
      
      As noted by Joe Perches, pr_debug() could be modified to
      handle this better, but that is a change to an interface
      used by the entire kernel and thus needs to be validated
      carefully.  This here is thus the less risky fix for
      2.6.25
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      21f644f3
  27. 08 4月, 2008 1 次提交
  28. 26 3月, 2008 1 次提交