Commit 77f0caec authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-header-and-core-spelling-corrections' 

Simon Horman says:

====================
net: header and core spelling corrections

This patchset addresses a number of spelling errors in comments in
Networking files under include/, and files in net/core/. Spelling
problems are as flagged by codespell.

It aims to provide patches that can be accepted directly into net-next.
And splits patches up based on maintainer boundaries: many things
feed directly into net-next. This is a complex process and I apologise
for any errors.

I also plan to address, via separate patches, spelling errors in other
files in the same directories, for files whose changes typically go
through trees other than net-next (which feed into net-next).
====================

Link: https://patch.msgid.link/20240822-net-spell-v1-0-3a98971ce2d2@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0de45db8 a8c924e9

include/linux/etherdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static inline struct ethhdr *eth_skb_pull_mac(struct sk_buff *skb) 
}



/**

 * eth_skb_pad - Pad buffer to mininum number of octets for Ethernet frame

 * eth_skb_pad - Pad buffer to minimum number of octets for Ethernet frame

 * @skb: Buffer to pad

 *

 * An Ethernet frame should have a minimum size of 60 bytes.  This function

include/linux/if_rmnet.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct rmnet_map_ul_csum_header { 


/* csum_info field:

 *  OFFSET:	where (offset in bytes) to insert computed checksum

 *  UDP:	1 = UDP checksum (zero checkum means no checksum)

 *  UDP:	1 = UDP checksum (zero checksum means no checksum)

 *  ENABLED:	1 = checksum computation requested

 */

#define MAP_CSUM_UL_OFFSET_MASK		GENMASK(13, 0)

include/linux/netdevice.h

+4 −4
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ struct netdev_net_notifier { 
 * int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[],

 *		      struct net_device *dev,

 *		      const unsigned char *addr, u16 vid)

 *	Deletes the FDB entry from dev coresponding to addr.

 *	Deletes the FDB entry from dev corresponding to addr.

 * int (*ndo_fdb_del_bulk)(struct nlmsghdr *nlh, struct net_device *dev,

 *			   struct netlink_ext_ack *extack);

 * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb,
@@ -3514,7 +3514,7 @@ static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue, 
	dql_completed(&dev_queue->dql, bytes);



	/*

	 * Without the memory barrier there is a small possiblity that

	 * Without the memory barrier there is a small possibility that

	 * netdev_tx_sent_queue will miss the update and cause the queue to

	 * be stopped forever

	 */
@@ -4583,7 +4583,7 @@ void dev_uc_flush(struct net_device *dev); 
void dev_uc_init(struct net_device *dev);



/**

 *  __dev_uc_sync - Synchonize device's unicast list

 *  __dev_uc_sync - Synchronize device's unicast list

 *  @dev:  device to sync

 *  @sync: function to call if address should be added

 *  @unsync: function to call if address should be removed
@@ -4627,7 +4627,7 @@ void dev_mc_flush(struct net_device *dev); 
void dev_mc_init(struct net_device *dev);



/**

 *  __dev_mc_sync - Synchonize device's multicast list

 *  __dev_mc_sync - Synchronize device's multicast list

 *  @dev:  device to sync

 *  @sync: function to call if address should be added

 *  @unsync: function to call if address should be removed

include/net/addrconf.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static inline struct inet6_dev *__in6_dev_get(const struct net_device *dev) 
/**

 * __in6_dev_stats_get - get inet6_dev pointer for stats

 * @dev: network device

 * @skb: skb for original incoming interface if neeeded

 * @skb: skb for original incoming interface if needed

 *

 * Caller must hold rcu_read_lock or RTNL, because this function

 * does not take a reference on the inet6_dev.

include/net/bond_3ad.h

+4 −1
Original line number Diff line number Diff line
@@ -231,7 +231,10 @@ typedef struct port { 
	mux_states_t sm_mux_state;	/* state machine mux state */

	u16 sm_mux_timer_counter;	/* state machine mux timer counter */

	tx_states_t sm_tx_state;	/* state machine tx state */

	u16 sm_tx_timer_counter;	/* state machine tx timer counter(allways on - enter to transmit state 3 time per second) */

	u16 sm_tx_timer_counter;	/* state machine tx timer counter

					 * (always on - enter to transmit

					 *  state 3 time per second)

					 */

	u16 sm_churn_actor_timer_counter;

	u16 sm_churn_partner_timer_counter;

	u32 churn_actor_count;