diff --git a/[refs] b/[refs] index 082938819c76..06b3d524e942 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e25f81c5a0b52097daff30fe72522d05967228 +refs/heads/master: ae1cbea5f9ae9d88da3ba7299f7d2d2574797f62 diff --git a/trunk/drivers/staging/bcm/Transmit.c b/trunk/drivers/staging/bcm/Transmit.c index adf545fc6b4e..27e8c890777b 100644 --- a/trunk/drivers/staging/bcm/Transmit.c +++ b/trunk/drivers/staging/bcm/Transmit.c @@ -40,7 +40,7 @@ * This function dispatches control packet to the h/w interface * @return zero(success) or -ve value(failure) */ -INT SendControlPacket(struct bcm_mini_adapter *Adapter, char *pControlPacket) +int SendControlPacket(struct bcm_mini_adapter *Adapter, char *pControlPacket) { struct bcm_leader *PLeader = (struct bcm_leader *)pControlPacket; @@ -81,7 +81,7 @@ INT SendControlPacket(struct bcm_mini_adapter *Adapter, char *pControlPacket) * to the target via the host h/w interface. * @return zero(success) or -ve value(failure) */ -INT SetupNextSend(struct bcm_mini_adapter *Adapter, struct sk_buff *Packet, USHORT Vcid) +int SetupNextSend(struct bcm_mini_adapter *Adapter, struct sk_buff *Packet, USHORT Vcid) { int status = 0; BOOLEAN bHeaderSupressionEnabled = FALSE;