Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (eac94da8) · Commits · Librem5 / linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

Admin message

source.puri.sm migrated to a new server, see new ssh key fingerprint.

eac94da8

Commit eac94da8 authored 10 years ago by John W. Linville

Downloads
- Plain Diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 209f6c37 b4b177a5

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/uapi/linux/nl80211.h 3 additions, 1 deletion

include/uapi/linux/nl80211.h
net/mac80211/ieee80211_i.h 1 addition, 0 deletions

net/mac80211/ieee80211_i.h
net/mac80211/mlme.c 13 additions, 7 deletions

net/mac80211/mlme.c
net/mac80211/offchannel.c 20 additions, 7 deletions

net/mac80211/offchannel.c

with 37 additions and 15 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