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

Unverified Commit acb92510 authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #41 from Flamefire/android_updates 

Final updates from Android branch
parents 7f985237 2d9e4e85

drivers/hid/hid-core.c

+0 −1
Original line number Diff line number Diff line
@@ -2153,7 +2153,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER_BT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -911,7 +911,6 @@ 
#define USB_VENDOR_ID_VALVE			0x28de

#define USB_DEVICE_ID_STEAM_CONTROLLER		0x1102

#define USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS	0x1142

#define USB_DEVICE_ID_STEAM_CONTROLLER_BT	0x1106



#define USB_VENDOR_ID_STEELSERIES	0x1038

#define USB_DEVICE_ID_STEELSERIES_SRWS1	0x1410

include/linux/virtio_vsock.h

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
#define VIRTIO_VSOCK_DEFAULT_MAX_BUF_SIZE	(1024 * 256)

#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE	(1024 * 4)

#define VIRTIO_VSOCK_MAX_BUF_SIZE		0xFFFFFFFFUL

#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE		(1024 * 64)

#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE		virtio_transport_max_vsock_pkt_buf_size

extern uint virtio_transport_max_vsock_pkt_buf_size;



enum {

	VSOCK_VQ_RX     = 0, /* for host to guest data */

net/netfilter/xt_qtaguid.c

+5 −14
Original line number Diff line number Diff line
@@ -1067,18 +1067,6 @@ static struct sock_tag *get_sock_stat_nl(const struct sock *sk) 
	return sock_tag_tree_search(&sock_tag_tree, sk);

}



static struct sock_tag *get_sock_stat(const struct sock *sk)

{

	struct sock_tag *sock_tag_entry;

	MT_DEBUG("qtaguid: get_sock_stat(sk=%p)\n", sk);

	if (!sk)

		return NULL;

	spin_lock_bh(&sock_tag_list_lock);

	sock_tag_entry = get_sock_stat_nl(sk);

	spin_unlock_bh(&sock_tag_list_lock);

	return sock_tag_entry;

}



static int ipx_proto(const struct sk_buff *skb,

		     struct xt_action_param *par)

{
@@ -1310,12 +1298,15 @@ static void if_tag_stat_update(const char *ifname, uid_t uid, 
	 * Look for a tagged sock.

	 * It will have an acct_uid.

	 */

	sock_tag_entry = get_sock_stat(sk);

	spin_lock_bh(&sock_tag_list_lock);

	sock_tag_entry = sk ? get_sock_stat_nl(sk) : NULL;

	if (sock_tag_entry) {

		tag = sock_tag_entry->tag;

		acct_tag = get_atag_from_tag(tag);

		uid_tag = get_utag_from_tag(tag);

	} else {

	}

	spin_unlock_bh(&sock_tag_list_lock);

	if (!sock_tag_entry) {

		acct_tag = make_atag_from_value(0);

		tag = combine_atag_with_uid(acct_tag, uid);

		uid_tag = make_tag_from_uid(uid);

net/netfilter/xt_quota2.c

+10 −11
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ quota_mt2(const struct sk_buff *skb, struct xt_action_param *par) 
{

	struct xt_quota_mtinfo2 *q = (void *)par->matchinfo;

	struct xt_quota_counter *e = q->master;

	int charge = (q->flags & XT_QUOTA_PACKET) ? 1 : skb->len;

	bool no_change = q->flags & XT_QUOTA_NO_CHANGE;

	bool ret = q->flags & XT_QUOTA_INVERT;



	spin_lock_bh(&e->lock);
@@ -296,20 +298,17 @@ quota_mt2(const struct sk_buff *skb, struct xt_action_param *par) 
		 * While no_change is pointless in "grow" mode, we will

		 * implement it here simply to have a consistent behavior.

		 */

		if (!(q->flags & XT_QUOTA_NO_CHANGE)) {

			e->quota += (q->flags & XT_QUOTA_PACKET) ? 1 : skb->len;

		}

		ret = true;

		if (!no_change)

			e->quota += charge;

		ret = true; /* note: does not respect inversion (bug??) */

	} else {

		if (e->quota > skb->len) {

			if (!(q->flags & XT_QUOTA_NO_CHANGE))

				e->quota -= (q->flags & XT_QUOTA_PACKET) ? 1 : skb->len;

		if (e->quota > charge) {

			if (!no_change)

				e->quota -= charge;

			ret = !ret;

		} else {

		} else if (e->quota) {

			/* We are transitioning, log that fact. */

			if (e->quota) {

			quota2_log(par->in, par->out, e, q->name);

			}

			/* we do not allow even small packets from now on */

			e->quota = 0;

		}