Commit d134b78e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-various-delete-duplicated-words' 



Randy Dunlap says:

====================
net: various: delete duplicated words

[PATCH 1/7 net-next] net: core: delete duplicated words
[PATCH 2/7 net-next] net: rds: delete duplicated words
[PATCH 3/7 net-next] net: ipv6: delete duplicated words
[PATCH 4/7 net-next] net: bluetooth: delete duplicated words
[PATCH 5/7 net-next] net: tipc: delete duplicated words
[PATCH 6/7 net-next] net: atm: delete duplicated words
[PATCH 7/7 net-next] net: bridge: delete duplicated words
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 785a2b10 4bbd026c

net/atm/lec.c

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ module_exit(lane_module_cleanup); 
/*

 * LANE2: 3.1.3, LE_RESOLVE.request

 * Non force allocates memory and fills in *tlvs, fills in *sizeoftlvs.

 * If sizeoftlvs == NULL the default TLVs associated with with this

 * If sizeoftlvs == NULL the default TLVs associated with this

 * lec will be used.

 * If dst_mac == NULL, targetless LE_ARP will be sent

 */

net/atm/signaling.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void modify_qos(struct atm_vcc *vcc, struct atmsvc_msg *msg) 
			msg->type = as_okay;

	}

	/*

	 * Should probably just turn around the old skb. But the, the buffer

	 * Should probably just turn around the old skb. But then, the buffer

	 * space accounting needs to follow the change too. Maybe later.

	 */

	while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
	return 0;

}



/* Encrypt the the link */

/* Encrypt the link */

static void hci_conn_encrypt(struct hci_conn *conn)

{

	BT_DBG("hcon %p", conn);

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt) 
	 * Delete Stored Link Key command. They are clearly indicating its

	 * absence in the bit mask of supported commands.

	 *

	 * Check the supported commands and only if the the command is marked

	 * Check the supported commands and only if the command is marked

	 * as supported send it. If not supported assume that the controller

	 * does not have actual support for stored link keys which makes this

	 * command redundant anyway.

net/bridge/br_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd) 


/*

 * Legacy ioctl's through SIOCDEVPRIVATE

 * This interface is deprecated because it was too difficult to

 * This interface is deprecated because it was too difficult

 * to do the translation for 32/64bit ioctl compatibility.

 */

static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)