Messages in this thread Patch in this message | | | From | "S.Çağlar Onur" <> | Subject | [PATCH] Fix hci_sock build with CONFIG_COMPAT=n | Date | Wed, 12 Sep 2007 11:59:48 +0300 |
| |
Hi;
Commit 66eb50d5c972cc16df2be730497b7f06d75d8132 introduces runtime check of CONFIG_COMPAT but without following patch compiliation failed with following error;
... CC [M] net/bluetooth/hci_event.o CC [M] net/bluetooth/hci_sock.o net/bluetooth/hci_sock.c: In function `hci_sock_cmsg': net/bluetooth/hci_sock.c:352: error: storage size of 'ctv' isn't known net/bluetooth/hci_sock.c:352: warning: unused variable `ctv' make[2]: *** [net/bluetooth/hci_sock.o] Hata 1 make[1]: *** [net/bluetooth] Hata 2 make: *** [net] Hata 2
Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
net/bluetooth/hci_sock.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index d16ca8e..1364a90 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -347,7 +347,7 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ int len; skb_get_timestamp(skb, &tv); - +#ifdef CONFIG_COMPAT if (msg->msg_flags & MSG_CMSG_COMPAT) { struct compat_timeval ctv; ctv.tv_sec = tv.tv_sec; @@ -355,9 +355,12 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ data = &ctv; len = sizeof(ctv); } else { +#endif data = &tv; len = sizeof(tv); +#ifdef CONFIG_COMPAT } +#endif put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data); }
Cheers -- S.Çağlar Onur <caglar@pardus.org.tr> http://cekirdek.pardus.org.tr/~caglar/
Linux is like living in a teepee. No Windows, no Gates and an Apache in house! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |