Skip to content

Commit 77f0cae

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 0de45db + a8c924e commit 77f0cae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+93
-89
lines changed

include/linux/etherdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static inline struct ethhdr *eth_skb_pull_mac(struct sk_buff *skb)
645645
}
646646

647647
/**
648-
* eth_skb_pad - Pad buffer to mininum number of octets for Ethernet frame
648+
* eth_skb_pad - Pad buffer to minimum number of octets for Ethernet frame
649649
* @skb: Buffer to pad
650650
*
651651
* An Ethernet frame should have a minimum size of 60 bytes. This function

include/linux/if_rmnet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct rmnet_map_ul_csum_header {
4242

4343
/* csum_info field:
4444
* OFFSET: where (offset in bytes) to insert computed checksum
45-
* UDP: 1 = UDP checksum (zero checkum means no checksum)
45+
* UDP: 1 = UDP checksum (zero checksum means no checksum)
4646
* ENABLED: 1 = checksum computation requested
4747
*/
4848
#define MAP_CSUM_UL_OFFSET_MASK GENMASK(13, 0)

include/linux/netdevice.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ struct netdev_net_notifier {
12371237
* int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[],
12381238
* struct net_device *dev,
12391239
* const unsigned char *addr, u16 vid)
1240-
* Deletes the FDB entry from dev coresponding to addr.
1240+
* Deletes the FDB entry from dev corresponding to addr.
12411241
* int (*ndo_fdb_del_bulk)(struct nlmsghdr *nlh, struct net_device *dev,
12421242
* struct netlink_ext_ack *extack);
12431243
* 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,
35143514
dql_completed(&dev_queue->dql, bytes);
35153515

35163516
/*
3517-
* Without the memory barrier there is a small possiblity that
3517+
* Without the memory barrier there is a small possibility that
35183518
* netdev_tx_sent_queue will miss the update and cause the queue to
35193519
* be stopped forever
35203520
*/
@@ -4583,7 +4583,7 @@ void dev_uc_flush(struct net_device *dev);
45834583
void dev_uc_init(struct net_device *dev);
45844584

45854585
/**
4586-
* __dev_uc_sync - Synchonize device's unicast list
4586+
* __dev_uc_sync - Synchronize device's unicast list
45874587
* @dev: device to sync
45884588
* @sync: function to call if address should be added
45894589
* @unsync: function to call if address should be removed
@@ -4627,7 +4627,7 @@ void dev_mc_flush(struct net_device *dev);
46274627
void dev_mc_init(struct net_device *dev);
46284628

46294629
/**
4630-
* __dev_mc_sync - Synchonize device's multicast list
4630+
* __dev_mc_sync - Synchronize device's multicast list
46314631
* @dev: device to sync
46324632
* @sync: function to call if address should be added
46334633
* @unsync: function to call if address should be removed

include/net/addrconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static inline struct inet6_dev *__in6_dev_get(const struct net_device *dev)
333333
/**
334334
* __in6_dev_stats_get - get inet6_dev pointer for stats
335335
* @dev: network device
336-
* @skb: skb for original incoming interface if neeeded
336+
* @skb: skb for original incoming interface if needed
337337
*
338338
* Caller must hold rcu_read_lock or RTNL, because this function
339339
* does not take a reference on the inet6_dev.

include/net/bond_3ad.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,10 @@ typedef struct port {
231231
mux_states_t sm_mux_state; /* state machine mux state */
232232
u16 sm_mux_timer_counter; /* state machine mux timer counter */
233233
tx_states_t sm_tx_state; /* state machine tx state */
234-
u16 sm_tx_timer_counter; /* state machine tx timer counter(allways on - enter to transmit state 3 time per second) */
234+
u16 sm_tx_timer_counter; /* state machine tx timer counter
235+
* (always on - enter to transmit
236+
* state 3 time per second)
237+
*/
235238
u16 sm_churn_actor_timer_counter;
236239
u16 sm_churn_partner_timer_counter;
237240
u32 churn_actor_count;

include/net/bond_alb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct slave;
5353

5454

5555
struct tlb_client_info {
56-
struct slave *tx_slave; /* A pointer to slave used for transmiting
56+
struct slave *tx_slave; /* A pointer to slave used for transmitting
5757
* packets to a Client that the Hash function
5858
* gave this entry index.
5959
*/

include/net/busy_poll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static inline void skb_mark_napi_id(struct sk_buff *skb,
131131
#endif
132132
}
133133

134-
/* used in the protocol hanlder to propagate the napi_id to the socket */
134+
/* used in the protocol handler to propagate the napi_id to the socket */
135135
static inline void sk_mark_napi_id(struct sock *sk, const struct sk_buff *skb)
136136
{
137137
#ifdef CONFIG_NET_RX_BUSY_POLL

include/net/caif/caif_layer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct caif_payload_info;
2020
* @assert: expression to evaluate.
2121
*
2222
* This function will print a error message and a do WARN_ON if the
23-
* assertion failes. Normally this will do a stack up at the current location.
23+
* assertion fails. Normally this will do a stack up at the current location.
2424
*/
2525
#define caif_assert(assert) \
2626
do { \
@@ -116,7 +116,7 @@ enum caif_direction {
116116
* @dn: Pointer down to the layer below.
117117
* @node: List node used when layer participate in a list.
118118
* @receive: Packet receive function.
119-
* @transmit: Packet transmit funciton.
119+
* @transmit: Packet transmit function.
120120
* @ctrlcmd: Used for control signalling upwards in the stack.
121121
* @modemcmd: Used for control signaling downwards in the stack.
122122
* @id: The identity of this layer

include/net/caif/cfpkt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct cfpkt *cfpkt_create(u16 len);
1818

1919
/*
2020
* Destroy a CAIF Packet.
21-
* pkt Packet to be destoyed.
21+
* pkt Packet to be destroyed.
2222
*/
2323
void cfpkt_destroy(struct cfpkt *pkt);
2424

include/net/dropreason-core.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ enum skb_drop_reason {
155155
/** @SKB_DROP_REASON_SOCKET_RCVBUFF: socket receive buff is full */
156156
SKB_DROP_REASON_SOCKET_RCVBUFF,
157157
/**
158-
* @SKB_DROP_REASON_PROTO_MEM: proto memory limition, such as udp packet
159-
* drop out of udp_memory_allocated.
158+
* @SKB_DROP_REASON_PROTO_MEM: proto memory limitation, such as
159+
* udp packet drop out of udp_memory_allocated.
160160
*/
161161
SKB_DROP_REASON_PROTO_MEM,
162162
/**
@@ -217,7 +217,7 @@ enum skb_drop_reason {
217217
*/
218218
SKB_DROP_REASON_TCP_ZEROWINDOW,
219219
/**
220-
* @SKB_DROP_REASON_TCP_OLD_DATA: the TCP data reveived is already
220+
* @SKB_DROP_REASON_TCP_OLD_DATA: the TCP data received is already
221221
* received before (spurious retrans may happened), see
222222
* LINUX_MIB_DELAYEDACKLOST
223223
*/

0 commit comments

Comments
 (0)