Merge remote-tracking branch 'mac80211/master' into HEAD (694c6186) · Commits · Nicola Sparnacci / linux-seco-intel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux-seco-intel
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

694c6186

Commit 694c6186 authored 12 years ago by Johannes Berg

Downloads
- Plain Diff

Merge remote-tracking branch 'mac80211/master' into HEAD

parents a49f0d1e 09b1426e

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

net/mac80211/cfg.c 2 additions, 0 deletions

net/mac80211/cfg.c
net/mac80211/chan.c 38 additions, 0 deletions

net/mac80211/chan.c
net/mac80211/ibss.c 4 additions, 5 deletions

net/mac80211/ibss.c
net/mac80211/ieee80211_i.h 9 additions, 7 deletions

net/mac80211/ieee80211_i.h
net/mac80211/iface.c 23 additions, 25 deletions

net/mac80211/iface.c
net/mac80211/mesh.c 4 additions, 4 deletions

net/mac80211/mesh.c
net/mac80211/mesh.h 1 addition, 1 deletion

net/mac80211/mesh.h
net/mac80211/mlme.c 54 additions, 21 deletions

net/mac80211/mlme.c
net/mac80211/scan.c 24 additions, 22 deletions

net/mac80211/scan.c
net/mac80211/sta_info.c 41 additions, 5 deletions

net/mac80211/sta_info.c
net/mac80211/sta_info.h 2 additions, 1 deletion

net/mac80211/sta_info.h

with 202 additions and 91 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