diff options
Diffstat (limited to 'net/caif/caif_dev.c')
-rw-r--r-- | net/caif/caif_dev.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index e84837e1bc8..024fd5bb2d3 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c | |||
@@ -247,10 +247,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, | |||
247 | 247 | ||
248 | switch (caifdev->link_select) { | 248 | switch (caifdev->link_select) { |
249 | case CAIF_LINK_HIGH_BANDW: | 249 | case CAIF_LINK_HIGH_BANDW: |
250 | pref = CFPHYPREF_LOW_LAT; | 250 | pref = CFPHYPREF_HIGH_BW; |
251 | break; | 251 | break; |
252 | case CAIF_LINK_LOW_LATENCY: | 252 | case CAIF_LINK_LOW_LATENCY: |
253 | pref = CFPHYPREF_HIGH_BW; | 253 | pref = CFPHYPREF_LOW_LAT; |
254 | break; | 254 | break; |
255 | default: | 255 | default: |
256 | pref = CFPHYPREF_HIGH_BW; | 256 | pref = CFPHYPREF_HIGH_BW; |
@@ -330,23 +330,28 @@ int caif_connect_client(struct caif_connect_request *conn_req, | |||
330 | struct cflayer *client_layer) | 330 | struct cflayer *client_layer) |
331 | { | 331 | { |
332 | struct cfctrl_link_param param; | 332 | struct cfctrl_link_param param; |
333 | if (connect_req_to_link_param(get_caif_conf(), conn_req, ¶m) == 0) | 333 | int ret; |
334 | /* Hook up the adaptation layer. */ | 334 | ret = connect_req_to_link_param(get_caif_conf(), conn_req, ¶m); |
335 | return cfcnfg_add_adaptation_layer(get_caif_conf(), | 335 | if (ret) |
336 | return ret; | ||
337 | /* Hook up the adaptation layer. */ | ||
338 | return cfcnfg_add_adaptation_layer(get_caif_conf(), | ||
336 | ¶m, client_layer); | 339 | ¶m, client_layer); |
337 | |||
338 | return -EINVAL; | ||
339 | |||
340 | caif_assert(0); | ||
341 | } | 340 | } |
342 | EXPORT_SYMBOL(caif_connect_client); | 341 | EXPORT_SYMBOL(caif_connect_client); |
343 | 342 | ||
344 | int caif_disconnect_client(struct cflayer *adap_layer) | 343 | int caif_disconnect_client(struct cflayer *adap_layer) |
345 | { | 344 | { |
346 | return cfcnfg_del_adapt_layer(get_caif_conf(), adap_layer); | 345 | return cfcnfg_disconn_adapt_layer(get_caif_conf(), adap_layer); |
347 | } | 346 | } |
348 | EXPORT_SYMBOL(caif_disconnect_client); | 347 | EXPORT_SYMBOL(caif_disconnect_client); |
349 | 348 | ||
349 | void caif_release_client(struct cflayer *adap_layer) | ||
350 | { | ||
351 | cfcnfg_release_adap_layer(adap_layer); | ||
352 | } | ||
353 | EXPORT_SYMBOL(caif_release_client); | ||
354 | |||
350 | /* Per-namespace Caif devices handling */ | 355 | /* Per-namespace Caif devices handling */ |
351 | static int caif_init_net(struct net *net) | 356 | static int caif_init_net(struct net *net) |
352 | { | 357 | { |