diff options
| author | Frank Lichtenheld <frank@lichtenheld.de> | 2007-11-14 15:57:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-11-14 15:57:38 -0800 |
| commit | 186fd777a8c63c28acdbcb0e9aefa7ebc858641e (patch) | |
| tree | 46658dd542fb4523b1138166fae45372bc63cd7e /drivers/isdn/sc | |
| parent | e1cd8f78f8cbfa314a095dbf704707217c8ee197 (diff) | |
| download | linux-stable-186fd777a8c63c28acdbcb0e9aefa7ebc858641e.tar.gz linux-stable-186fd777a8c63c28acdbcb0e9aefa7ebc858641e.tar.bz2 linux-stable-186fd777a8c63c28acdbcb0e9aefa7ebc858641e.zip | |
[ISDN] sc: Fix sndpkt to have the correct number of arguments
isdn_if.writebuf_skb has an additional ack flag argument which
was missing from sndpkt leading to the following warning:
CC [M] drivers/isdn/sc/init.o
drivers/isdn/sc/init.c: In function ‘sc_init’:
drivers/isdn/sc/init.c:281: warning: assignment from incompatible pointer type
Note that this doesn't actually do anything with the flag, it
just fixes the warning (and probably accessing the last argument).
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/sc')
| -rw-r--r-- | drivers/isdn/sc/card.h | 2 | ||||
| -rw-r--r-- | drivers/isdn/sc/packet.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/sc/card.h b/drivers/isdn/sc/card.h index 5992f63c383e..0120bcf88311 100644 --- a/drivers/isdn/sc/card.h +++ b/drivers/isdn/sc/card.h @@ -109,7 +109,7 @@ void memcpy_fromshmem(int card, void *dest, const void *src, size_t n); int get_card_from_id(int driver); int indicate_status(int card, int event, ulong Channel, char *Data); irqreturn_t interrupt_handler(int interrupt, void *cardptr); -int sndpkt(int devId, int channel, struct sk_buff *data); +int sndpkt(int devId, int channel, int ack, struct sk_buff *data); void rcvpkt(int card, RspMessage *rcvmsg); int command(isdn_ctrl *cmd); int reset(int card); diff --git a/drivers/isdn/sc/packet.c b/drivers/isdn/sc/packet.c index 92016a2608e9..5ff6ae868440 100644 --- a/drivers/isdn/sc/packet.c +++ b/drivers/isdn/sc/packet.c @@ -20,7 +20,7 @@ #include "message.h" #include "card.h" -int sndpkt(int devId, int channel, struct sk_buff *data) +int sndpkt(int devId, int channel, int ack, struct sk_buff *data) { LLData ReqLnkWrite; int status; |