Skip to content

Commit

Permalink
Staging: w35und: move packet_came() to wb35rx.c
Browse files Browse the repository at this point in the history
The function no longer has dependencies to wbusb.c so we can move it to
wb35rx.c and make it static now.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent c930e0c commit 3cae503
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 30 deletions.
28 changes: 27 additions & 1 deletion drivers/staging/winbond/wb35rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,34 @@ void Wb35Rx_adjust(PDESCRIPTOR pRxDes)
pRxDes->buffer_size[0] = BufferSize;
}

extern void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize);
static void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize)
{
struct wbsoft_priv *priv = hw->priv;
struct sk_buff *skb;
struct ieee80211_rx_status rx_status = {0};

if (!priv->enabled)
return;

skb = dev_alloc_skb(PacketSize);
if (!skb) {
printk("Not enough memory for packet, FIXME\n");
return;
}

memcpy(skb_put(skb, PacketSize),
pRxBufferAddress,
PacketSize);

/*
rx_status.rate = 10;
rx_status.channel = 1;
rx_status.freq = 12345;
rx_status.phymode = MODE_IEEE80211B;
*/

ieee80211_rx_irqsafe(hw, skb, &rx_status);
}

u16 Wb35Rx_indicate(struct ieee80211_hw *hw)
{
Expand Down
29 changes: 0 additions & 29 deletions drivers/staging/winbond/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,35 +391,6 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
return err;
}

void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize)
{
struct wbsoft_priv *priv = hw->priv;
struct sk_buff *skb;
struct ieee80211_rx_status rx_status = {0};

if (!priv->enabled)
return;

skb = dev_alloc_skb(PacketSize);
if (!skb) {
printk("Not enough memory for packet, FIXME\n");
return;
}

memcpy(skb_put(skb, PacketSize),
pRxBufferAddress,
PacketSize);

/*
rx_status.rate = 10;
rx_status.channel = 1;
rx_status.freq = 12345;
rx_status.phymode = MODE_IEEE80211B;
*/

ieee80211_rx_irqsafe(hw, skb, &rx_status);
}

static void wb35_hw_halt(struct wbsoft_priv *adapter)
{
Mds_Destroy( adapter );
Expand Down

0 comments on commit 3cae503

Please sign in to comment.