Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353897
b: refs/heads/master
c: fdc64a9
h: refs/heads/master
i:
  353895: 40d17cf
v: v3
  • Loading branch information
Sebastian Hahn authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 35e7dad commit a5aa1ed
Show file tree
Hide file tree
Showing 10 changed files with 366 additions and 366 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0db7a34e6c8e902c6fc58c2116278dd8e88fefb7
refs/heads/master: fdc64a9eda15535076cc7e97fcfab3dc7d432f11
14 changes: 7 additions & 7 deletions trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -2088,10 +2088,10 @@ struct ieee80211_device {
struct delayed_work start_ibss_wq;
struct work_struct wx_sync_scan_wq;
struct workqueue_struct *wq;
// Qos related. Added by Annie, 2005-11-01.
//STA_QOS StaQos;
// Qos related. Added by Annie, 2005-11-01.
//STA_QOS StaQos;

//u32 STA_EDCA_PARAM[4];
//u32 STA_EDCA_PARAM[4];
//CHANNEL_ACCESS_SETTING ChannelAccessSetting;


Expand All @@ -2107,11 +2107,11 @@ struct ieee80211_device {
struct net_device *dev);

int (*reset_port)(struct net_device *dev);
int (*is_queue_full) (struct net_device * dev, int pri);
int (*is_queue_full) (struct net_device * dev, int pri);

int (*handle_management) (struct net_device * dev,
struct ieee80211_network * network, u16 type);
int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
int (*handle_management) (struct net_device * dev,
struct ieee80211_network * network, u16 type);
int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);

/* Softmac-generated frames (management) are TXed via this
* callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
Expand Down
Loading

0 comments on commit a5aa1ed

Please sign in to comment.