aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-19 19:24:32 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-19 19:24:32 +0100
commitdd9f8c3507995f7ccfe42b1f1728f4d57d04c5c6 (patch)
treef2bfdaa9108e8c3f400a94ffb5c273bc4a85911b
parentba3b22f22c8d878071b56b5a5befbfee579f063b (diff)
downloadkernel_samsung_smdk4412-dd9f8c3507995f7ccfe42b1f1728f4d57d04c5c6.zip
kernel_samsung_smdk4412-dd9f8c3507995f7ccfe42b1f1728f4d57d04c5c6.tar.gz
kernel_samsung_smdk4412-dd9f8c3507995f7ccfe42b1f1728f4d57d04c5c6.tar.bz2
needed backports from 3.4 kernel to enable debugging in the ath9k wifi driver
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--fs/libfs.c7
-rw-r--r--include/linux/fs.h1
-rw-r--r--include/linux/ieee80211.h7
3 files changed, 15 insertions, 0 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 275ca474..3af183c 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -264,6 +264,13 @@ Enomem:
return ERR_PTR(-ENOMEM);
}
+int simple_open(struct inode *inode, struct file *file)
+{
+ if (inode->i_private)
+ file->private_data = inode->i_private;
+ return 0;
+}
+
int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
{
struct inode *inode = old_dentry->d_inode;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f74b004..39fbfd3 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2467,6 +2467,7 @@ extern int dcache_readdir(struct file *, void *, filldir_t);
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
+extern int simple_open(struct inode *inode, struct file *file);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
extern int simple_unlink(struct inode *, struct dentry *);
extern int simple_rmdir(struct inode *, struct dentry *);
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 2d5ace9..7dd1458 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -804,6 +804,13 @@ struct ieee80211_mmie {
u8 mic[8];
} __attribute__ ((packed));
+struct ieee80211_vendor_ie {
+ u8 element_id;
+ u8 len;
+ u8 oui[3];
+ u8 oui_type;
+} __packed;
+
/* Control frames */
struct ieee80211_rts {
__le16 frame_control;