Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

ba9b28d1

Commit ba9b28d1 authored 18 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'upstream' of...

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

parents 862fc81b 5c601d0c

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/Kconfig 17 additions, 0 deletions

drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile 2 additions, 0 deletions

drivers/net/wireless/Makefile
drivers/net/wireless/bcm43xx/bcm43xx_main.c 7 additions, 6 deletions

drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/zd1201.c 26 additions, 41 deletions

drivers/net/wireless/zd1201.c
drivers/net/wireless/zd1201.h 0 additions, 0 deletions

drivers/net/wireless/zd1201.h
drivers/usb/net/Kconfig 0 additions, 17 deletions

drivers/usb/net/Kconfig
drivers/usb/net/Makefile 0 additions, 1 deletion

drivers/usb/net/Makefile
include/net/ieee80211.h 2 additions, 1 deletion

include/net/ieee80211.h
include/net/ieee80211softmac.h 1 addition, 1 deletion

include/net/ieee80211softmac.h
net/ieee80211/ieee80211_tx.c 19 additions, 6 deletions

net/ieee80211/ieee80211_tx.c
net/ieee80211/softmac/Kconfig 1 addition, 0 deletions

net/ieee80211/softmac/Kconfig
net/ieee80211/softmac/ieee80211softmac_assoc.c 19 additions, 3 deletions

net/ieee80211/softmac/ieee80211softmac_assoc.c
net/ieee80211/softmac/ieee80211softmac_auth.c 7 additions, 5 deletions

net/ieee80211/softmac/ieee80211softmac_auth.c
net/ieee80211/softmac/ieee80211softmac_event.c 4 additions, 1 deletion

net/ieee80211/softmac/ieee80211softmac_event.c
net/ieee80211/softmac/ieee80211softmac_io.c 75 additions, 94 deletions

net/ieee80211/softmac/ieee80211softmac_io.c

with 180 additions and 176 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment