Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea94b503 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 650a10dc b81c087f

drivers/uwb/hwa-rc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

drivers/uwb/wlp/txrx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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())