Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106646
b: refs/heads/master
c: 93110f6
h: refs/heads/master
v: v3
  • Loading branch information
David Sterba authored and Linus Torvalds committed Jul 28, 2008
1 parent c0c44bb commit ae619f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 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: d54c2752f6bb6cc53359dcdf6ed4fb6e5fb6440a
refs/heads/master: 93110f698fe92fc4dfd86c78783aedf522c69eb9
15 changes: 3 additions & 12 deletions trunk/drivers/char/pcmcia/ipwireless/hardware.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,19 +400,14 @@ static void swap_packet_bitfield_from_le(unsigned char *data)
#endif
}

static int do_send_fragment(struct ipw_hardware *hw, unsigned char *data,
static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data,
unsigned length)
{
unsigned i;
unsigned long flags;

start_timing();

if (length == 0)
return 0;

if (length > hw->ll_mtu)
return -1;
BUG_ON(length > hw->ll_mtu);

if (ipwireless_debug)
dump_data_bytes("send", data, length);
Expand Down Expand Up @@ -458,11 +453,9 @@ static int do_send_fragment(struct ipw_hardware *hw, unsigned char *data,
spin_unlock_irqrestore(&hw->lock, flags);

end_write_timing(length);

return 0;
}

static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
{
unsigned short fragment_data_len;
unsigned short data_left = packet->length - packet->offset;
Expand Down Expand Up @@ -522,8 +515,6 @@ static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
packet->length);
kfree(packet);
}

return 0;
}

static void ipw_setup_hardware(struct ipw_hardware *hw)
Expand Down

0 comments on commit ae619f2

Please sign in to comment.