diff --git a/[refs] b/[refs] index 0569b53ea38a..712a6f5bebf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49e1b9faed736b20ad9a785638919341b567a595 +refs/heads/master: 46cb35f5e761306b031029af2061ea263359a764 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_tx.c b/trunk/drivers/net/wireless/wl12xx/wl1251_tx.c index faa23efd05a1..c8223185efd2 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1251_tx.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1251_tx.c @@ -219,6 +219,7 @@ static int wl1251_tx_send_packet(struct wl1251 *wl, struct sk_buff *skb, /* align the buffer on a 4-byte boundary */ skb_reserve(skb, offset); memmove(skb->data, src, skb->len); + tx_hdr = (struct tx_double_buffer_desc *) skb->data; } else { wl1251_info("No handler, fixme!"); return -EINVAL;