History

atm: remove the unused send_oam / push_oam callbacks

The atmdev_ops::send_oam device operation and the atm_vcc::push_oam callback were the kernel's interface for raw F4/F5 OAM cell exchange. Nothing assigns them a non-NULL value and nothing ever invokes them: the core only ever initialises push_oam to NULL (in vcc_create() and the AAL init helpers) and the Solos driver only lists send_oam = NULL for documentation. The drivers that actually drove OAM through these hooks were removed along with the legacy ATM adapters. Drop both callbacks and the NULL initialisers.

Jakub Kicinski committed 5 months ago

Commit b20aa9e1 parent c1468144 files · +0 −12Browse files

Showing the changes to include (1 of 4 files). Show all

Unified · Split

include/linux/atmdev.h+0−8
@@ -104,7 +104,6 @@ struct atm_vcc { · 103 unmodified lines
104104 void (*release_cb)(struct atm_vcc *vcc); /* release_sock callback */
105105 void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
106106 void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
107− int (*push_oam)(struct atm_vcc *vcc,void *cell);
108107 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
109108 void *dev_data; /* per-device data */
110109 void *proto_data; /* per-protocol data */
@@ -170,12 +169,6 @@ struct atm_dev { · 59 unmodified lines
170169 struct list_head dev_list; /* linkage */
171170 };
172171
173−
174−/* OF: send_Oam Flags */
175−
176−#define ATM_OF_IMMED 1 /* Attempt immediate delivery */
177−#define ATM_OF_INRATE 2 /* Attempt in-rate delivery */
178−
179172 struct atmdev_ops { /* only send is required */
180173 void (*dev_close)(struct atm_dev *dev);
181174 int (*open)(struct atm_vcc *vcc);
@@ -188,7 +181,6 @@ struct atmdev_ops { /* only send is required */ · 6 unmodified lines
188181 int (*pre_send)(struct atm_vcc *vcc, struct sk_buff *skb);
189182 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
190183 int (*send_bh)(struct atm_vcc *vcc, struct sk_buff *skb);
191− int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
192184 void (*phy_put)(struct atm_dev *dev,unsigned char value,
193185 unsigned long addr);
194186 unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t