summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of ↵David S. Miller2010-04-235-156/+694
|\ | | | | | | git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
| * bridge br_multicast: IPv6 MLD support.YOSHIFUJI Hideaki2010-04-233-4/+429
| | | | | | | | Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| * bridge br_multicast: Make functions less ipv4 dependent.YOSHIFUJI Hideaki2010-04-232-58/+151
| | | | | | | | | | | | | | | | Introduce struct br_ip{} to store ip address and protocol and make functions more generic so that we can support both IPv4 and IPv6 with less pain. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| * ipv6 mcast: Introduce include/net/mld.h for MLD definitions.YOSHIFUJI Hideaki2010-04-232-95/+115
| | | | | | | | Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
* | IPv6: Complete IPV6_DONTFRAG supportBrian Haley2010-04-237-8/+116
| | | | | | | | | | | | | | | | | | | | Finally add support to detect a local IPV6_DONTFRAG event and return the relevant data to the user if they've enabled IPV6_RECVPATHMTU on the socket. The next recvmsg() will return no data, but have an IPV6_PATHMTU as ancillary data. Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | IPv6: Add dontfrag argument to relevant functionsBrian Haley2010-04-239-12/+46
| | | | | | | | | | | | | | | | | | Add dontfrag argument to relevant functions for IPV6_DONTFRAG support, as well as allowing the value to be passed-in via ancillary cmsg data. Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | IPv6: data structure changes for new socket optionsBrian Haley2010-04-233-4/+57
| | | | | | | | | | | | | | | | | | | | Add underlying data structure changes and basic setsockopt() and getsockopt() support for IPV6_RECVPATHMTU, IPV6_PATHMTU, and IPV6_DONTFRAG. IPV6_PATHMTU is actually fully functional at this point. Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | l2tp_eth: fix memory allocationJiri Pirko2010-04-231-28/+1
| | | | | | | | | | | | | | | | | | Since .size is set properly in "struct pernet_operations l2tp_eth_net_ops", allocating space for "struct l2tp_eth_net" by hand is not correct, even causes memory leakage. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | l2tp: fix memory allocationJiri Pirko2010-04-231-28/+1
| | | | | | | | | | | | | | | | | | Since .size is set properly in "struct pernet_operations l2tp_net_ops", allocating space for "struct l2tp_net" by hand is not correct, even causes memory leakage. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'master' into for-davemJohn W. Linville2010-04-23127-8937/+19023
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: drivers/net/wireless/ath/ath9k/phy.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-debugfs.c
| * | radiotap parser: fix endian annotationJohannes Berg2010-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I updated this from the corresponding userspace library, an annotation error crept in -- this variable needs to be annotated as little endian. No effect on code generation. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k_hw: make all AR9002 initvals use u32Luis R. Rodriguez2010-04-211-34/+34
| | | | | | | | | | | | | | | Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k_hw: make two initvals consto for the AR9001 familyLuis R. Rodriguez2010-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This makes ar5416Addac_9160 and ar5416Addac_9160 const I guess we skipped them long ago. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoringJuuso Oikarinen2010-04-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When IEEE80211_HW_CONNECTION_MONITOR is configured by the driver, starting of ieee80211_sta_conn_mon_timer should be prevented, as it is then not needed. This is currently partially the case. As it seems, when a probe-response is received from the AP the timer is still restarted, thus restarting the host based connection keep-alive mechanism. These probe-responses happen at least when scanning while associated. Fix this by preventing starting of the ieee80211_sta_conn_mon_timer in the ieee80211_rx_mgmt_probe_resp function. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: set the STBC flag in rate control if the peer supports itFelix Fietkau2010-04-201-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: add support for Tx and Rx STBCFelix Fietkau2010-04-203-1/+15
| | | | | | | | | | | | | | | | | | | | | Supported only for single stream rates by the hardware Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: add flags for STBC (Space-Time Block Coding)Felix Fietkau2010-04-202-0/+5
| | | | | | | | | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: initialize the number of tx/rx streams correctlyFelix Fietkau2010-04-201-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | AR9300 based hardware can 3x3 MCS rates, this should be set in the HT capabilities. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: reduce the bits_per_symbol table size, support more streamsFelix Fietkau2010-04-201-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | Instead of increasing bits_per_symbol for supporting more streams, keep it single-stream only and multiply the values by the numer of streams. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: update the ath_max_4ms_framelen tableFelix Fietkau2010-04-201-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include MCS0-31 and also add SGI for HT20. This makes it possible to support more different rate combinations with newer hardware. Based on a patch by Selvam. T. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: update the MCS mask for MCS16 and aboveFelix Fietkau2010-04-201-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: clean up tx buffer handlingFelix Fietkau2010-04-201-35/+32
| | | | | | | | | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: check for specific rx stuck conditions and recover from themFelix Fietkau2010-04-203-1/+31
| | | | | | | | | | | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: document IEEE80211_CONF_CHANGE_QOSStanislaw Gruszka2010-04-201-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath5k: basic support for surveyHolger Schurig2010-04-201-0/+19
| | | | | | | | | | | | | | | | | | | | | This adds the first element of survey data, the noise floor figure. Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: sample survey implementation for mac80211 & hwsimHolger Schurig2010-04-204-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the survey function to both mac80211 itself and to mac80211_hwsim. For the latter driver, we simply invent some noise level.A real driver which cannot determine the real channel noise MUST NOT report any noise, especially not a magically conjured one :-) Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | ath9k: Group Key fix for VAPsDaniel Yingqiang Ma2010-04-203-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I set up multiple VAPs with ath9k, I encountered an issue that the traffic may be lost after a while. The detailed phenomenon is 1. After a while the clients connected to one of these VAPs will get into a state that no broadcast/multicast packets can be transfered successfully while the unicast packets can be transfered normally. 2. Minutes latter the unitcast packets transfer will fail as well, because the ARP entry is expired and it can't be freshed due to the broadcast trouble. It's caused by the group key overwritten and someone discussed this issue in ath9k-devel maillist before, but haven't work out a fix yet. I referred the method in madwifi, and made a patch for ath9k. The method is to set the high bit of the sender(AP)'s address, and associated that mac and the group key. It requires the hardware supports multicast frame key search. It seems true for AR9160. Not sure whether it's the correct way to fix this issue. But it seems to work in my test. The patch is attached, feel free to revise it. Signed-off-by: Daniel Yingqiang ma <yma.cool@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | wireless: rt2x00: rt2800usb: identify Allwin devicesXose Vazquez Perez2010-04-191-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied common sense, no info from the manufacturer: (0x8516, 0x2070) is RT2070 (0x8516, 0x2770) is RT2770 (0x8516, 0x2870) is RT2870 [...] Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: add missing newlineJohannes Berg2010-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | One HT debugging printk is missing a newline, add it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | orinoco: have sparse check endian issuesDavid Kilroy2010-04-191-0/+3
| | | | | | | | | | | | | | | | | | | | | Orinoco should be endian clean, so enable the checking. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | orinoco: use cfg80211_find_ieDavid Kilroy2010-04-192-14/+2
| | | | | | | | | | | | | | | | | | | | | Instead of using a local function. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | orinoco: implement set_wiphy_paramsDavid Kilroy2010-04-194-179/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to set fragmentation and RTS thresholds. Also report RTS retry settings during wiphy init. Note that the existing semantics for enabling microwave robustness are preserved on firmwares that have it. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: Prevent running sta_cleanup timer unnecessarilyJuuso Oikarinen2010-04-192-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sta_cleanup timer is used to periodically expire buffered frames from the tx buf. The timer is executing periodically, regardless of the need for it. This is wasting resources. Fix this simply by not restarting the sta_cleanup timer if the tx buffer was empty. Restart the timer when there is some more tx-traffic. Cc: Janne Ylälehto <janne.ylalehto@nokia.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: fix stopping RX BA session from timerJohannes Berg2010-04-191-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kalle reported that his system deadlocks since my recent work in this area. The reason quickly became apparent: we try to cancel_timer_sync() a timer from within itself. Fix that by making the function aware of the context it is called from. Reported-by: Kalle Valo <kvalo@adurom.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Tested-by: Kalle Valo <kvalo@adurom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | mac80211: fix typo in commentsDaniel Halperin2010-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The flag is called IEEE80211_TX_STAT_AMPDU rather than using the whole word STATUS. Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | Merge branch 'wireless-next-2.6' of ↵John W. Linville2010-04-1929-1522/+1641
| |\ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
| | * | iwlwifi: make scan antenna forcing more genericJohannes Berg2010-04-163-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some future hardware will also require some antenna overrides so make the current logic more generic; right now it is semantically based on a workaround for off-channel reception but the reasons for the new antenna overrides will be different. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: remove monitor checkJohannes Berg2010-04-161-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Off-channel reception is acceptable in monitor mode, and checking for monitor mode this way is not really correct anyway since it could be the case while operating. Now iwl_is_monitor_mode() is no longer used so remove it completely. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: don't check monitor for scanningJohannes Berg2010-04-164-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor mode operation need not (and probably should not) affect scanning this way since real monitoring can not properly happen while scanning anyway. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: rename TX_CMD_FLG_BT_DIS_MSKJohannes Berg2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag name is a little misleading, this flag instructs the device to ignore bluetooth messages for purposes of frame transmissions, so rename the flag to TX_CMD_FLG_IGNORE_BT. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: make BT coex config a virtual methodJohannes Berg2010-04-167-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some future hardware will require a different command to be sent for bluetooth coexist, so make this a virtual method that can be changed on a per-device basis. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: more code clean up for agn devicesWey-Yi Guy2010-04-163-78/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since multiple new devices having similar uCode architecture and use same registers address, remove more reference to 5000 series to eliminate the confusion. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: sanity check for turn on aggregation tidWey-Yi Guy2010-04-161-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform sanity check for turn on aggregation tid. Also remove the option for turn on all the aggregation tids at once since it is deprecated function and not being used. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: PA type for 6000g2 seriesWey-Yi Guy2010-04-163-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 6000g2 series of NICs, PA type is determined by uCode, driver do not have to set the register for internal/external PA. It is a workaround just for 6000 series NICs. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: add hw revision for 6000g2 NICWey-Yi Guy2010-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hardware revision for 6000g2 series of NIC Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: remove redundant iwl_dump_lq_cmd()Shanyu Zhao2010-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is called twice in a row, remove the second one. Signed-off-by: Shanyu Zhao <shanyu.zhao@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: add debugfs ops to iwlwifiAbhijeet Kolekar2010-04-1610-739/+973
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seperate debugfs functions into iwlagn specific debugfs file and Add debugfs ops to iwlwifi. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: remove duplicated debug functionsWey-Yi Guy2010-04-162-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the show uCode statistics function for uCode debugging purposes only; it is being duplicated in both debugfs and sysfs. remove the one from sysfs. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: bring up 6000 Series 2x2 AGN Gen2 adaptersShanyu Zhao2010-04-164-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to bring up 6000 Series 2x2 AGN Gen2 adapters. Seperate various version numbers from 6000 Series definitions; Add module firmware declaration for the new adapters; Add additional device IDs and subsystem IDs; Signed-off-by: Shanyu Zhao <shanyu.zhao@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
| | * | iwlwifi: more generic eeprom definesWey-Yi Guy2010-04-163-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some definition for eeprom apply to more than 5000 series device, change the name to reflect it for easy reading. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
OpenPOWER on IntegriCloud