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

Unified · Split

4 files
  1. drivers/atm/solos-pci.c +0 −1
  2. include/linux/atmdev.h +0 −8
  3. net/atm/common.c +0 −1
  4. net/atm/raw.c +0 −2
drivers/atm/solos-pci.c+0−1
@@ -1180,7 +1180,6 @@ static const struct atmdev_ops fpga_ops = { · 1179 unmodified lines
1180 .close = pclose,1180 .close = pclose,
1181 .ioctl = NULL,1181 .ioctl = NULL,
1182 .send = psend,1182 .send = psend,
1183 .send_oam = NULL,
1184 .phy_put = NULL,1183 .phy_put = NULL,
1185 .phy_get = NULL,1184 .phy_get = NULL,
1186 .change_qos = NULL,1185 .change_qos = NULL,
include/linux/atmdev.h+0−8
@@ -104,7 +104,6 @@ struct atm_vcc { · 103 unmodified lines
104 void (*release_cb)(struct atm_vcc *vcc); /* release_sock callback */104 void (*release_cb)(struct atm_vcc *vcc); /* release_sock callback */
105 void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);105 void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
106 void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */106 void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
107 int (*push_oam)(struct atm_vcc *vcc,void *cell);
108 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);107 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
109 void *dev_data; /* per-device data */108 void *dev_data; /* per-device data */
110 void *proto_data; /* per-protocol data */109 void *proto_data; /* per-protocol data */
@@ -170,12 +169,6 @@ struct atm_dev { · 59 unmodified lines
170 struct list_head dev_list; /* linkage */169 struct list_head dev_list; /* linkage */
171};170};
172 171
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
179struct atmdev_ops { /* only send is required */172struct atmdev_ops { /* only send is required */
180 void (*dev_close)(struct atm_dev *dev);173 void (*dev_close)(struct atm_dev *dev);
181 int (*open)(struct atm_vcc *vcc);174 int (*open)(struct atm_vcc *vcc);
@@ -188,7 +181,6 @@ struct atmdev_ops { /* only send is required */ · 6 unmodified lines
188 int (*pre_send)(struct atm_vcc *vcc, struct sk_buff *skb);181 int (*pre_send)(struct atm_vcc *vcc, struct sk_buff *skb);
189 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);182 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
190 int (*send_bh)(struct atm_vcc *vcc, struct sk_buff *skb);183 int (*send_bh)(struct atm_vcc *vcc, struct sk_buff *skb);
191 int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
192 void (*phy_put)(struct atm_dev *dev,unsigned char value,184 void (*phy_put)(struct atm_dev *dev,unsigned char value,
193 unsigned long addr);185 unsigned long addr);
194 unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr);186 unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr);
net/atm/common.c+0−1
@@ -163,7 +163,6 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family, i · 162 unmodified lines
163 vcc->push = NULL;163 vcc->push = NULL;
164 vcc->pop = NULL;164 vcc->pop = NULL;
165 vcc->owner = NULL;165 vcc->owner = NULL;
166 vcc->push_oam = NULL;
167 vcc->release_cb = NULL;166 vcc->release_cb = NULL;
168 vcc->vpi = vcc->vci = 0; /* no VCI/VPI yet */167 vcc->vpi = vcc->vci = 0; /* no VCI/VPI yet */
169 vcc->atm_options = vcc->aal_options = 0;168 vcc->atm_options = vcc->aal_options = 0;
net/atm/raw.c+0−2
@@ -63,7 +63,6 @@ int atm_init_aal0(struct atm_vcc *vcc) · 62 unmodified lines
63{63{
64 vcc->push = atm_push_raw;64 vcc->push = atm_push_raw;
65 vcc->pop = atm_pop_raw;65 vcc->pop = atm_pop_raw;
66 vcc->push_oam = NULL;
67 vcc->send = atm_send_aal0;66 vcc->send = atm_send_aal0;
68 return 0;67 return 0;
69}68}
@@ -72,7 +71,6 @@ int atm_init_aal5(struct atm_vcc *vcc) · 2 unmodified lines
72{71{
73 vcc->push = atm_push_raw;72 vcc->push = atm_push_raw;
74 vcc->pop = atm_pop_raw;73 vcc->pop = atm_pop_raw;
75 vcc->push_oam = NULL;
76 if (vcc->dev->ops->send_bh)74 if (vcc->dev->ops->send_bh)
77 vcc->send = vcc->dev->ops->send_bh;75 vcc->send = vcc->dev->ops->send_bh;
78 else76 else

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