Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: allow WLP to be used with IPv6.
  uwb: event_size should be signed
This commit is contained in:
Linus Torvalds 2009-06-24 10:26:24 -07:00
commit ea94b5034b
2 changed files with 2 additions and 2 deletions

View file

@ -501,7 +501,7 @@ int hwarc_filter_event_WUSB_0100(struct uwb_rc *rc, struct uwb_rceb **header,
int result = -ENOANO; int result = -ENOANO;
struct uwb_rceb *rceb = *header; struct uwb_rceb *rceb = *header;
int event = le16_to_cpu(rceb->wEvent); int event = le16_to_cpu(rceb->wEvent);
size_t event_size; ssize_t event_size;
size_t core_size, offset; size_t core_size, offset;
if (rceb->bEventType != UWB_RC_CET_GENERAL) if (rceb->bEventType != UWB_RC_CET_GENERAL)

View file

@ -326,7 +326,7 @@ int wlp_prepare_tx_frame(struct device *dev, struct wlp *wlp,
int result = -EINVAL; int result = -EINVAL;
struct ethhdr *eth_hdr = (void *) skb->data; struct ethhdr *eth_hdr = (void *) skb->data;
if (is_broadcast_ether_addr(eth_hdr->h_dest)) { if (is_multicast_ether_addr(eth_hdr->h_dest)) {
result = wlp_eda_for_each(&wlp->eda, wlp_wss_send_copy, skb); result = wlp_eda_for_each(&wlp->eda, wlp_wss_send_copy, skb);
if (result < 0) { if (result < 0) {
if (printk_ratelimit()) if (printk_ratelimit())