Skip to content

Commit

Permalink
wl12xx: add system_hlid
Browse files Browse the repository at this point in the history 
system_hlid is a const hlid (always 0), used by the fw and driver
for packets which are not bound to specific role (e.g. dynamic
memory packets).
indicate it as always allocated.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Aug 22, 2011
1 parent fa6ad9f commit f4df1bd
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 17 deletions.
9 changes: 8 additions & 1 deletion drivers/net/wireless/wl12xx/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
q = wl1271_tx_get_queue(mapping);

if (wl->bss_type == BSS_TYPE_AP_BSS)
hlid = wl1271_tx_get_hlid(skb);
hlid = wl12xx_tx_get_hlid_ap(wl, skb);

spin_lock_irqsave(&wl->wl_lock, flags);

Expand Down Expand Up @@ -2069,6 +2069,9 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
memset(wl->roles_map, 0, sizeof(wl->roles_map));
memset(wl->links_map, 0, sizeof(wl->links_map));

/* The system link is always allocated */
__set_bit(WL12XX_SYSTEM_HLID, wl->links_map);

/*
* this is performed after the cancel_work calls and the associated
* mutex_lock, so that wl1271_op_add_interface does not accidentally
Expand Down Expand Up @@ -4407,6 +4410,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl->tx_security_seq = 0;
wl->tx_security_last_seq_lsb = 0;
wl->role_id = WL12XX_INVALID_ROLE_ID;
wl->system_hlid = WL12XX_SYSTEM_HLID;
wl->sta_hlid = WL12XX_INVALID_LINK_ID;
wl->dev_role_id = WL12XX_INVALID_ROLE_ID;
wl->dev_hlid = WL12XX_INVALID_LINK_ID;
Expand All @@ -4415,6 +4419,9 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl->fwlog_size = 0;
init_waitqueue_head(&wl->fwlog_waitq);

/* The system link is always allocated */
__set_bit(WL12XX_SYSTEM_HLID, wl->links_map);

memset(wl->tx_frames_map, 0, sizeof(wl->tx_frames_map));
for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
wl->tx_frames[i] = NULL;
Expand Down
40 changes: 25 additions & 15 deletions drivers/net/wireless/wl12xx/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
}
#endif

u8 wl1271_tx_get_hlid(struct sk_buff *skb)
static bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
{
return wl->dummy_packet == skb;
}

u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)
{
struct ieee80211_tx_info *control = IEEE80211_SKB_CB(skb);

Expand All @@ -145,6 +150,9 @@ u8 wl1271_tx_get_hlid(struct sk_buff *skb)
} else {
struct ieee80211_hdr *hdr;

if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
return wl->system_hlid;

hdr = (struct ieee80211_hdr *)skb->data;
if (ieee80211_is_mgmt(hdr->frame_control))
return WL1271_AP_GLOBAL_HLID;
Expand All @@ -153,6 +161,20 @@ u8 wl1271_tx_get_hlid(struct sk_buff *skb)
}
}

static u8 wl1271_tx_get_hlid(struct wl1271 *wl, struct sk_buff *skb)
{
if (wl12xx_is_dummy_packet(wl, skb))
return wl->system_hlid;

if (wl->bss_type == BSS_TYPE_AP_BSS)
return wl12xx_tx_get_hlid_ap(wl, skb);

if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
return wl->sta_hlid;
else
return wl->dev_hlid;
}

static unsigned int wl12xx_calc_packet_alignment(struct wl1271 *wl,
unsigned int packet_length)
{
Expand Down Expand Up @@ -221,11 +243,6 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
return ret;
}

static bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
{
return wl->dummy_packet == skb;
}

static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
u32 extra, struct ieee80211_tx_info *control,
u8 hlid)
Expand Down Expand Up @@ -371,14 +388,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
}
}

if (wl->bss_type == BSS_TYPE_AP_BSS)
hlid = wl1271_tx_get_hlid(skb);
else
if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
hlid = wl->sta_hlid;
else
hlid = wl->dev_hlid;

hlid = wl1271_tx_get_hlid(wl, skb);
if (hlid == WL12XX_INVALID_LINK_ID) {
wl1271_error("invalid hlid. dropping skb 0x%p", skb);
return -EINVAL;
Expand Down Expand Up @@ -564,7 +574,7 @@ static void wl1271_skb_queue_head(struct wl1271 *wl, struct sk_buff *skb)
if (wl12xx_is_dummy_packet(wl, skb)) {
set_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &wl->flags);
} else if (wl->bss_type == BSS_TYPE_AP_BSS) {
u8 hlid = wl1271_tx_get_hlid(skb);
u8 hlid = wl1271_tx_get_hlid(wl, skb);
skb_queue_head(&wl->links[hlid].tx_queue[q], skb);

/* make sure we dequeue the same packet next time */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/wl12xx/tx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void wl1271_tx_flush(struct wl1271 *wl);
u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set);
u32 wl1271_tx_min_rate_get(struct wl1271 *wl);
u8 wl1271_tx_get_hlid(struct sk_buff *skb);
u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb);
void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid);
void wl1271_handle_tx_low_watermark(struct wl1271 *wl);

Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/wl12xx/wl12xx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ extern u32 wl12xx_debug_level;
#define WL12XX_MAX_LINKS 8
#define WL12XX_INVALID_ROLE_ID 0xff
#define WL12XX_INVALID_LINK_ID 0xff
#define WL12XX_SYSTEM_HLID 0
#define WL1271_AP_GLOBAL_HLID 0
#define WL1271_AP_BROADCAST_HLID 1
#define WL1271_AP_STA_HLID_START 2
Expand Down Expand Up @@ -395,6 +396,7 @@ struct wl1271 {
int channel;
u8 role_id;
u8 dev_role_id;
u8 system_hlid;
u8 sta_hlid;
u8 dev_hlid;

Expand Down

0 comments on commit f4df1bd

Please sign in to comment.