Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
417c5233
Commit
417c5233
authored
Oct 13, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
parents
91cd1756
c49de94a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
4 deletions
+11
-4
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43/xmit.c
+3
-0
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+1
-1
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+1
-1
include/net/mac80211.h
include/net/mac80211.h
+2
-0
net/mac80211/ibss.c
net/mac80211/ibss.c
+2
-2
net/mac80211/rx.c
net/mac80211/rx.c
+2
-0
No files found.
drivers/net/wireless/b43/xmit.c
View file @
417c5233
...
...
@@ -690,7 +690,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
}
memcpy
(
IEEE80211_SKB_RXCB
(
skb
),
&
status
,
sizeof
(
status
));
local_bh_disable
();
ieee80211_rx
(
dev
->
wl
->
hw
,
skb
);
local_bh_enable
();
#if B43_DEBUG
dev
->
rx_count
++
;
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @
417c5233
...
...
@@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
out_pci_disable_device:
pci_disable_device
(
pdev
);
out_ieee80211_free_hw:
ieee80211_free_hw
(
priv
->
hw
);
iwl_free_traffic_mem
(
priv
);
ieee80211_free_hw
(
priv
->
hw
);
out:
return
err
;
}
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @
417c5233
...
...
@@ -4096,8 +4096,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
pci_set_drvdata
(
pdev
,
NULL
);
pci_disable_device
(
pdev
);
out_ieee80211_free_hw:
ieee80211_free_hw
(
priv
->
hw
);
iwl_free_traffic_mem
(
priv
);
ieee80211_free_hw
(
priv
->
hw
);
out:
return
err
;
}
...
...
include/net/mac80211.h
View file @
417c5233
...
...
@@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
* to this function and ieee80211_rx_irqsafe() may not be mixed for a
* single hardware.
*
* Note that right now, this function must be called with softirqs disabled.
*
* @hw: the hardware this frame came in on
* @skb: the buffer to receive, owned by mac80211 after this call
*/
...
...
net/mac80211/ibss.c
View file @
417c5233
...
...
@@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
"%pM
\n
"
,
bss
->
cbss
.
bssid
,
ifibss
->
bssid
);
#endif
/* CONFIG_MAC80211_IBSS_DEBUG */
if
(
bss
&&
memcmp
(
ifibss
->
bssid
,
bss
->
cbss
.
bssid
,
ETH_ALEN
))
{
if
(
bss
&&
!
memcmp
(
ifibss
->
bssid
,
bss
->
cbss
.
bssid
,
ETH_ALEN
))
{
printk
(
KERN_DEBUG
"%s: Selected IBSS BSSID %pM"
" based on configured SSID
\n
"
,
sdata
->
dev
->
name
,
bss
->
cbss
.
bssid
);
...
...
@@ -829,7 +829,7 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local)
if
(
!
sdata
->
u
.
ibss
.
ssid_len
)
continue
;
sdata
->
u
.
ibss
.
last_scan_completed
=
jiffies
;
ieee80211_sta_find_ibss
(
sdata
);
mod_timer
(
&
sdata
->
u
.
ibss
.
timer
,
0
);
}
mutex_unlock
(
&
local
->
iflist_mtx
);
}
...
...
net/mac80211/rx.c
View file @
417c5233
...
...
@@ -2453,6 +2453,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
struct
ieee80211_supported_band
*
sband
;
struct
ieee80211_rx_status
*
status
=
IEEE80211_SKB_RXCB
(
skb
);
WARN_ON_ONCE
(
softirq_count
()
==
0
);
if
(
WARN_ON
(
status
->
band
<
0
||
status
->
band
>=
IEEE80211_NUM_BANDS
))
goto
drop
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment