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
7cd082f0
Commit
7cd082f0
authored
Dec 12, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
parents
b11d0e48
1cf9e8a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
drivers/net/skge.c
drivers/net/skge.c
+6
-4
net/ieee80211/Kconfig
net/ieee80211/Kconfig
+1
-1
No files found.
drivers/net/skge.c
View file @
7cd082f0
...
...
@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
}
if
(
unlikely
(
skge
->
tx_avail
<
skb_shinfo
(
skb
)
->
nr_frags
+
1
))
{
netif_stop_queue
(
dev
);
spin_unlock_irqrestore
(
&
skge
->
tx_lock
,
flags
);
if
(
!
netif_stopped
(
dev
))
{
netif_stop_queue
(
dev
);
printk
(
KERN_WARNING
PFX
"%s: ring full when queue awake!
\n
"
,
dev
->
name
);
printk
(
KERN_WARNING
PFX
"%s: ring full when queue awake!
\n
"
,
dev
->
name
);
}
spin_unlock_irqrestore
(
&
skge
->
tx_lock
,
flags
);
return
NETDEV_TX_BUSY
;
}
...
...
net/ieee80211/Kconfig
View file @
7cd082f0
...
...
@@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP
config IEEE80211_CRYPT_TKIP
tristate "IEEE 802.11i TKIP encryption"
depends on IEEE80211
depends on IEEE80211
&& NET_RADIO
select CRYPTO
select CRYPTO_MICHAEL_MIC
---help---
...
...
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